fix: align importing of celestia_tendermint_proto in celestia_tendermint

.github/workflows/test.yml

@@ -44,7 +44,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test-all-features
-          args: -p tendermint
+          args: -p celestia-tendermint
 
   # tendermint-rpc:
   #   runs-on: ubuntu-latest
@@ -70,7 +70,7 @@ jobs:
       - uses: actions-rs/cargo@v1
         with:
           command: test-all-features
-          args: -p tendermint-proto
+          args: -p celestia-tendermint-proto
 
   # tendermint-light-client:
   #   runs-on: ubuntu-latest

proto/src/prelude.rs

@@ -1,5 +1,6 @@
 // Re-export according to alloc::prelude::v1 because it is not yet stabilized
 // https://doc.rust-lang.org/src/alloc/prelude/v1.rs.html
+#[allow(unused)]
 pub use alloc::{
     borrow::ToOwned,
     boxed::Box,

tendermint/src/abci/event.rs

@@ -202,8 +202,8 @@ mod v0_34 {
     use crate::prelude::*;
     use core::convert::{TryFrom, TryInto};
 
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<EventAttribute> for pb::EventAttribute {
         fn from(event: EventAttribute) -> Self {
@@ -264,8 +264,8 @@ mod v0_37 {
     use crate::prelude::*;
     use core::convert::{TryFrom, TryInto};
 
-    use tendermint_proto::v0_37::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_37::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<EventAttribute> for pb::EventAttribute {
         fn from(event: EventAttribute) -> Self {

tendermint/src/abci/request/info.rs

@@ -19,8 +19,8 @@ pub struct Info {
 
 mod v0_34 {
     use super::Info;
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<Info> for pb::RequestInfo {
         fn from(info: Info) -> Self {
@@ -50,8 +50,8 @@ mod v0_34 {
 
 mod v0_37 {
     use super::Info;
-    use tendermint_proto::v0_37::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_37::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<Info> for pb::RequestInfo {
         fn from(info: Info) -> Self {

tendermint/src/abci/request/prepare_proposal.rs

@@ -15,8 +15,8 @@ pub struct PrepareProposal {
 mod v0_34 {
     use super::PrepareProposal;
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<PrepareProposal> for pb::RequestPrepareProposal {
         fn from(value: PrepareProposal) -> Self {

tendermint/src/abci/request/process_proposal.rs

@@ -15,8 +15,8 @@ pub struct ProcessProposal {
 mod v0_34 {
     use super::ProcessProposal;
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<ProcessProposal> for pb::RequestProcessProposal {
         fn from(value: ProcessProposal) -> Self {

tendermint/src/abci/request/set_option.rs

@@ -13,8 +13,8 @@ pub struct SetOption {
 
 // The SetOption request has been removed after 0.34.
 
-use tendermint_proto::v0_34::abci as pb;
-use tendermint_proto::Protobuf;
+use celestia_tendermint_proto::v0_34::abci as pb;
+use celestia_tendermint_proto::Protobuf;
 
 impl From<SetOption> for pb::RequestSetOption {
     fn from(message: SetOption) -> Self {

tendermint/src/abci/response/info.rs

@@ -1,5 +1,5 @@
 use crate::{block, prelude::*, AppHash};
-use tendermint_proto::v0_37::abci as pb;
+use celestia_tendermint_proto::v0_37::abci as pb;
 
 use serde::{Deserialize, Serialize};
 

tendermint/src/abci/response/prepare_proposal.rs

@@ -14,8 +14,8 @@ pub struct PrepareProposal {
 mod v0_34 {
     use super::PrepareProposal;
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<PrepareProposal> for pb::ResponsePrepareProposal {
         fn from(value: PrepareProposal) -> Self {

tendermint/src/abci/response/process_proposal.rs

@@ -26,8 +26,8 @@ pub enum ProcessProposalResult {
 mod v0_34 {
     use super::{ProcessProposal, ProcessProposalResult};
     use crate::Error;
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     impl From<ProcessProposal> for pb::ResponseProcessProposal {
         fn from(value: ProcessProposal) -> pb::ResponseProcessProposal {

tendermint/src/abci/response/set_option.rs

@@ -15,8 +15,8 @@ pub struct SetOption {
 
 // The SetOption request has been removed after 0.34.
 
-use tendermint_proto::v0_34::abci as pb;
-use tendermint_proto::Protobuf;
+use celestia_tendermint_proto::v0_34::abci as pb;
+use celestia_tendermint_proto::Protobuf;
 
 impl From<SetOption> for pb::ResponseSetOption {
     fn from(message: SetOption) -> Self {

tendermint/src/abci/types.rs

@@ -121,8 +121,8 @@ pub struct Snapshot {
 mod v0_34 {
     use super::{CommitInfo, Misbehavior, MisbehaviorKind, Snapshot, Validator, VoteInfo};
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     use bytes::Bytes;
 
@@ -280,8 +280,8 @@ mod v0_34 {
 mod v0_37 {
     use super::{CommitInfo, Misbehavior, MisbehaviorKind, Snapshot, Validator, VoteInfo};
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_37::abci as pb;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_37::abci as pb;
+    use celestia_tendermint_proto::Protobuf;
 
     use bytes::Bytes;
 

tendermint/src/account.rs

@@ -11,7 +11,7 @@ use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use subtle::{self, ConstantTimeEq};
 use subtle_encoding::hex;
 
-use tendermint_proto::Protobuf;
+use celestia_tendermint_proto::Protobuf;
 
 use crate::serializers::cow_str::CowStr;
 use crate::{error::Error, prelude::*};

tendermint/src/block.rs

@@ -12,8 +12,8 @@ mod round;
 pub mod signed_header;
 mod size;
 
+use celestia_tendermint_proto::v0_34::types::Block as RawBlock;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_34::types::Block as RawBlock;
 
 pub use self::{
     commit::*,
@@ -53,8 +53,8 @@ pub struct Block {
 mod v0_34 {
     use super::{Block, Commit, Header};
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::types::Block as RawBlock;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::types::Block as RawBlock;
+    use celestia_tendermint_proto::Protobuf;
 
     impl Protobuf<RawBlock> for Block {}
 

tendermint/src/block/commit.rs

@@ -1,7 +1,7 @@
 //! Commits to a Tendermint blockchain
 
+use celestia_tendermint_proto::v0_37::types::Commit as RawCommit;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::types::Commit as RawCommit;
 
 use crate::{
     block::{commit_sig::CommitSig, Height, Id, Round},

tendermint/src/block/data.rs

@@ -1,5 +1,5 @@
+use celestia_tendermint_proto::v0_34::types::Data as RawData;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_34::types::Data as RawData;
 
 use crate::prelude::*;
 
@@ -15,8 +15,8 @@ pub struct Data {
 mod v0_34 {
     use super::Data;
     use crate::{prelude::*, Error};
-    use tendermint_proto::v0_34::types::Data as RawData;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_34::types::Data as RawData;
+    use celestia_tendermint_proto::Protobuf;
 
     impl Protobuf<RawData> for Data {}
 

tendermint/src/block/header.rs

@@ -1,11 +1,11 @@
 //! Block headers
 
-use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::{
+use celestia_tendermint_proto::v0_37::{
     types::{BlockId as RawBlockId, Header as RawHeader},
     version::Consensus as RawConsensusVersion,
 };
-use tendermint_proto::Protobuf;
+use celestia_tendermint_proto::Protobuf;
+use serde::{Deserialize, Serialize};
 
 use crate::{
     account, block, chain,

tendermint/src/block/height.rs

@@ -4,8 +4,8 @@ use core::{
     str::FromStr,
 };
 
+use celestia_tendermint_proto::Protobuf;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
-use tendermint_proto::Protobuf;
 
 use crate::serializers::cow_str::CowStr;
 use crate::{error::Error, prelude::*};

tendermint/src/block/id.rs

@@ -3,8 +3,8 @@ use core::{
     str::{self, FromStr},
 };
 
+use celestia_tendermint_proto::v0_37::types::BlockId as RawBlockId;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::types::BlockId as RawBlockId;
 
 use crate::{
     block::parts::Header as PartSetHeader,

tendermint/src/block/meta.rs

@@ -1,7 +1,7 @@
 //! Block metadata
 
+use celestia_tendermint_proto::v0_37::types::BlockMeta as RawMeta;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::types::BlockMeta as RawMeta;
 
 use super::{Header, Id};
 use crate::prelude::*;

tendermint/src/block/parts.rs

@@ -1,7 +1,7 @@
 //! Block parts
 
+use celestia_tendermint_proto::v0_37::types::PartSetHeader as RawPartSetHeader;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::types::PartSetHeader as RawPartSetHeader;
 
 use crate::{error::Error, prelude::*, Hash};
 

tendermint/src/block/signed_header.rs

@@ -2,8 +2,8 @@
 //! It is what the rpc endpoint /commit returns and hence can be used by a
 //! light client.
 
+use celestia_tendermint_proto::v0_37::types::SignedHeader as RawSignedHeader;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::types::SignedHeader as RawSignedHeader;
 
 use crate::{block, Error};
 

tendermint/src/block/size.rs

@@ -30,10 +30,10 @@ impl Size {
 mod v0_34 {
     use super::Size;
     use crate::error::Error;
-    use tendermint_proto::v0_34::{
+    use celestia_tendermint_proto::v0_34::{
         abci::BlockParams as RawAbciSize, types::BlockParams as RawSize,
     };
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::Protobuf;
 
     impl Protobuf<RawSize> for Size {}
 
@@ -94,8 +94,8 @@ mod v0_34 {
 mod v0_37 {
     use super::Size;
     use crate::error::Error;
-    use tendermint_proto::v0_37::types::BlockParams as RawSize;
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::v0_37::types::BlockParams as RawSize;
+    use celestia_tendermint_proto::Protobuf;
 
     impl Protobuf<RawSize> for Size {}
 

tendermint/src/chain/id.rs

@@ -8,8 +8,8 @@ use core::{
     str::{self, FromStr},
 };
 
+use celestia_tendermint_proto::Protobuf;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
-use tendermint_proto::Protobuf;
 
 use crate::serializers::cow_str::CowStr;
 use crate::{error::Error, prelude::*};

tendermint/src/consensus/params.rs

@@ -55,14 +55,14 @@ fn key_type(s: &str) -> public_key::Algorithm {
 }
 
 mod v0_34 {
-    use tendermint_proto::v0_34::{
+    use celestia_tendermint_proto::v0_34::{
         abci::ConsensusParams as RawAbciParams,
         types::{
             ConsensusParams as RawParams, ValidatorParams as RawValidatorParams,
             VersionParams as RawVersionParams,
         },
     };
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::Protobuf;
 
     use super::{key_type, Params, ValidatorParams, VersionParams};
     use crate::{error::Error, prelude::*, public_key};
@@ -186,11 +186,11 @@ mod v0_34 {
 }
 
 mod v0_37 {
-    use tendermint_proto::v0_37::types::{
+    use celestia_tendermint_proto::v0_37::types::{
         ConsensusParams as RawParams, ValidatorParams as RawValidatorParams,
         VersionParams as RawVersionParams,
     };
-    use tendermint_proto::Protobuf;
+    use celestia_tendermint_proto::Protobuf;
 
     use super::{key_type, Params, ValidatorParams, VersionParams};
     use crate::{error::Error, prelude::*, public_key};

tendermint/src/consensus/state.rs

@@ -26,7 +26,7 @@ pub struct State {
     pub step: i8,
 
     /// Block ID being proposed (if available)
-    #[serde(with = "tendermint_proto::serializers::optional")]
+    #[serde(with = "celestia_tendermint_proto::serializers::optional")]
     pub block_id: Option<block::Id>,
 }
 

tendermint/src/evidence.rs

@@ -5,9 +5,9 @@ use core::{
     slice,
 };
 
+use celestia_tendermint_proto::google::protobuf::Duration as RawDuration;
+use celestia_tendermint_proto::Protobuf;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::google::protobuf::Duration as RawDuration;
-use tendermint_proto::Protobuf;
 
 use crate::{
     block::{signed_header::SignedHeader, Height},

tendermint/src/hash.rs

@@ -7,9 +7,9 @@ use core::{
 };
 
 use bytes::Bytes;
+use celestia_tendermint_proto::Protobuf;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
 use subtle_encoding::{Encoding, Hex};
-use tendermint_proto::Protobuf;
 
 use crate::serializers::cow_str::CowStr;
 use crate::{error::Error, prelude::*};

tendermint/src/merkle/proof.rs

@@ -1,7 +1,7 @@
 //! Merkle proofs
 
+use celestia_tendermint_proto::v0_37::crypto::Proof as RawProof;
 use serde::{Deserialize, Serialize};
-use tendermint_proto::v0_37::crypto::Proof as RawProof;
 
 use crate::{prelude::*, serializers, Hash};