Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

imp: use global paths in generated code by ibc-derive #1017

Merged
merged 2 commits into from
Dec 22, 2023
Merged

imp: use global paths in generated code by ibc-derive #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2121e9
ibc-derive: use global paths in generated code
mina86 Dec 21, 2023
1de9e73
chore: unclog
Farhad-Shabani Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/unreleased/improvements/1017-use-global-paths-in-generated-code.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- `[ibc-derive]` Use global paths in generated code by macros to prevent
namespace conflicts with local modules
([#1017](https://github.com/cosmos/ibc-rs/pull/1017))
32 changes: 16 additions & 16 deletions ibc-derive/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,67 +10,67 @@ pub struct Imports;

impl Imports {
pub fn CommitmentRoot() -> TokenStream {
quote! {ibc::core::commitment_types::commitment::CommitmentRoot}
quote! {::ibc::core::commitment_types::commitment::CommitmentRoot}
}

pub fn CommitmentPrefix() -> TokenStream {
quote! {ibc::core::commitment_types::commitment::CommitmentPrefix}
quote! {::ibc::core::commitment_types::commitment::CommitmentPrefix}
}

pub fn CommitmentProofBytes() -> TokenStream {
quote! {ibc::core::commitment_types::commitment::CommitmentProofBytes}
quote! {::ibc::core::commitment_types::commitment::CommitmentProofBytes}
}

pub fn Path() -> TokenStream {
quote! {ibc::core::host::types::path::Path}
quote! {::ibc::core::host::types::path::Path}
}

pub fn ConsensusState() -> TokenStream {
quote! {ibc::core::client::context::consensus_state::ConsensusState}
quote! {::ibc::core::client::context::consensus_state::ConsensusState}
}

pub fn ClientStateCommon() -> TokenStream {
quote! {ibc::core::client::context::client_state::ClientStateCommon}
quote! {::ibc::core::client::context::client_state::ClientStateCommon}
}

pub fn ClientStateValidation() -> TokenStream {
quote! {ibc::core::client::context::client_state::ClientStateValidation}
quote! {::ibc::core::client::context::client_state::ClientStateValidation}
}

pub fn ClientStateExecution() -> TokenStream {
quote! {ibc::core::client::context::client_state::ClientStateExecution}
quote! {::ibc::core::client::context::client_state::ClientStateExecution}
}

pub fn ClientId() -> TokenStream {
quote! {ibc::core::host::types::identifiers::ClientId}
quote! {::ibc::core::host::types::identifiers::ClientId}
}

pub fn ClientType() -> TokenStream {
quote! {ibc::core::host::types::identifiers::ClientType}
quote! {::ibc::core::host::types::identifiers::ClientType}
}

pub fn ClientError() -> TokenStream {
quote! {ibc::core::client::types::error::ClientError}
quote! {::ibc::core::client::types::error::ClientError}
}

pub fn Height() -> TokenStream {
quote! {ibc::core::client::types::Height}
quote! {::ibc::core::client::types::Height}
}

pub fn Any() -> TokenStream {
quote! {ibc::primitives::proto::Any}
quote! {::ibc::primitives::proto::Any}
}

pub fn Timestamp() -> TokenStream {
quote! {ibc::core::primitives::Timestamp}
quote! {::ibc::core::primitives::Timestamp}
}

pub fn UpdateKind() -> TokenStream {
quote! {ibc::core::client::types::UpdateKind}
quote! {::ibc::core::client::types::UpdateKind}
}

pub fn Status() -> TokenStream {
quote! {ibc::core::client::types::Status}
quote! {::ibc::core::client::types::Status}
}
}

Expand Down
Loading