Skip to content

Commit 695a9f7

Browse files
soareschensoareschen
authored
Update hermes-sdk with new export convention (#410)
* Update hermes-sdk with new export convention * Use hermes_core to simplify imports * Use hermes_cosmos_core * Don't use hermes_cosmos_core when crates don't need concrete contexts * Use hermes_cosmos instead of hermes_cosmos_core * Use hermes_cosmos_core in other crates * Migrating to use hermes-cosmos-core * More refactoring * Simplify Cargo dependencies * Fix Nix build * Update hermes sdk * Use hermes_prelude instead of cgp::prelude * Use back main branch
1 parent 2337161 commit 695a9f7

File tree

274 files changed

+1741
-2639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

274 files changed

+1741
-2639
lines changed

‎light-client/Cargo.lock‎

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎light-client/Cargo.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ ibc-proto = { version = "0.51.1", default-features = false }
3333
tendermint = { version = "0.40.0", default-features = false }
3434

3535
cgp = { version = "0.4.0" }
36+
hermes-prelude = { version = "0.1.0" }
3637
hermes-encoding-components = { version = "0.1.0" }
3738
hermes-protobuf-encoding-components = { version = "0.1.0" }
3839
hermes-cosmos-encoding-components = { version = "0.1.0" }
@@ -95,6 +96,7 @@ cgp-runtime = { git = "https://github.com/contextgeneric/cgp.git" }
9596
cgp-sync = { git = "https://github.com/contextgeneric/cgp.git" }
9697
cgp-inner = { git = "https://github.com/contextgeneric/cgp.git" }
9798

99+
hermes-prelude = { git = "https://github.com/informalsystems/hermes-sdk.git" }
98100
hermes-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
99101
hermes-protobuf-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }
100102
hermes-cosmos-encoding-components = { git = "https://github.com/informalsystems/hermes-sdk.git" }

‎light-client/ibc-client-starknet-types/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ derive_more = { workspace = true }
2121
prost = { workspace = true }
2222
serde = { workspace = true, optional = true }
2323
cgp = { workspace = true }
24+
hermes-prelude = { workspace = true }
2425
hermes-encoding-components = { workspace = true }
2526
hermes-protobuf-encoding-components = { workspace = true }
2627
hermes-cosmos-encoding-components = { workspace = true }

‎light-client/ibc-client-starknet-types/src/client_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cgp::prelude::*;
1+
use hermes_prelude::*;
22
use ibc_core::client::types::Height;
33
use ibc_core::host::types::identifiers::ChainId;
44

‎light-client/ibc-client-starknet-types/src/consensus_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cgp::prelude::*;
1+
use hermes_prelude::*;
22
use ibc_core::commitment_types::commitment::CommitmentRoot;
33
use ibc_core::primitives::Timestamp;
44

‎light-client/ibc-client-starknet-types/src/encoding/components.rs‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
#[cgp::re_export_imports]
22
mod preset {
33
use cgp::core::component::{UseContext, UseDelegate};
4-
use cgp::prelude::*;
54
use hermes_cosmos_encoding_components::components::CosmosEncodingComponents;
6-
use hermes_encoding_components::traits::convert::ConverterComponent;
7-
use hermes_encoding_components::traits::decode::DecoderComponent;
8-
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
9-
use hermes_encoding_components::traits::encode::EncoderComponent;
10-
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
11-
use hermes_encoding_components::traits::schema::SchemaGetterComponent;
12-
use hermes_encoding_components::traits::types::decode_buffer::DecodeBufferTypeComponent;
13-
use hermes_encoding_components::traits::types::encode_buffer::EncodeBufferTypeComponent;
14-
use hermes_encoding_components::traits::types::encoded::EncodedTypeComponent;
15-
use hermes_encoding_components::traits::types::schema::SchemaTypeComponent;
5+
use hermes_encoding_components::traits::{
6+
ConverterComponent, DecodeBufferTypeComponent, DecoderComponent, EncodeBufferTypeComponent,
7+
EncodedTypeComponent, EncoderComponent, MutDecoderComponent, MutEncoderComponent,
8+
SchemaGetterComponent, SchemaTypeComponent,
9+
};
10+
use hermes_prelude::*;
1611
use hermes_protobuf_encoding_components::impl_type_url;
17-
use hermes_protobuf_encoding_components::impls::any::{
18-
DecodeAsAnyProtobuf, EncodeAsAnyProtobuf,
12+
use hermes_protobuf_encoding_components::impls::{
13+
DecodeAsAnyProtobuf, EncodeAsAnyProtobuf, EncodeProtoWithMutBuffer, EncodeViaAny,
1914
};
20-
use hermes_protobuf_encoding_components::impls::encode::buffer::EncodeProtoWithMutBuffer;
21-
use hermes_protobuf_encoding_components::impls::via_any::EncodeViaAny;
22-
use hermes_protobuf_encoding_components::traits::length::EncodedLengthGetterComponent;
15+
use hermes_protobuf_encoding_components::traits::EncodedLengthGetterComponent;
2316
use hermes_protobuf_encoding_components::types::any::Any;
2417
use hermes_protobuf_encoding_components::types::strategy::{ViaAny, ViaProtobuf};
2518
use ibc_core::client::types::Height;

‎light-client/ibc-client-starknet-types/src/encoding/impls/client_state.rs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
use cgp::core::component::UseContext;
2-
use cgp::prelude::*;
3-
use hermes_cosmos_encoding_components::impls::chain_id::EncodeChainIdField;
4-
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
5-
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
6-
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
7-
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
8-
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
9-
use hermes_encoding_components::traits::transform::Transformer;
10-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField;
11-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
12-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
2+
use hermes_cosmos_encoding_components::impls::EncodeChainIdField;
3+
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
4+
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
5+
use hermes_prelude::*;
6+
use hermes_protobuf_encoding_components::impls::{
7+
DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField,
8+
};
139
use ibc_core::client::types::Height;
1410
use ibc_core::host::types::identifiers::ChainId;
1511

‎light-client/ibc-client-starknet-types/src/encoding/impls/consensus_state.rs‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
use cgp::core::component::UseContext;
2-
use cgp::prelude::*;
3-
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
4-
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
5-
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
6-
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
7-
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
8-
use hermes_encoding_components::traits::transform::Transformer;
9-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
10-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
2+
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
3+
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
4+
use hermes_prelude::*;
5+
use hermes_protobuf_encoding_components::impls::{
6+
DecodeRequiredProtoField, EncodeLengthDelimitedProtoField,
7+
};
118
use ibc_core::commitment_types::commitment::CommitmentRoot;
129
use ibc_core::primitives::Timestamp;
1310

‎light-client/ibc-client-starknet-types/src/encoding/impls/header.rs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
use cgp::core::component::UseContext;
2-
use cgp::prelude::*;
3-
use hermes_encoding_components::impls::encode_mut::combine::CombineEncoders;
4-
use hermes_encoding_components::impls::encode_mut::field::EncodeField;
5-
use hermes_encoding_components::impls::encode_mut::from::DecodeFrom;
6-
use hermes_encoding_components::traits::decode_mut::MutDecoderComponent;
7-
use hermes_encoding_components::traits::encode_mut::MutEncoderComponent;
8-
use hermes_encoding_components::traits::transform::Transformer;
9-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::bytes::EncodeByteField;
10-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::decode_required::DecodeRequiredProtoField;
11-
use hermes_protobuf_encoding_components::impls::encode_mut::proto_field::encode::EncodeLengthDelimitedProtoField;
2+
use hermes_encoding_components::impls::{CombineEncoders, DecodeFrom, EncodeField};
3+
use hermes_encoding_components::traits::{MutDecoderComponent, MutEncoderComponent, Transformer};
4+
use hermes_prelude::*;
5+
use hermes_protobuf_encoding_components::impls::{
6+
DecodeRequiredProtoField, EncodeByteField, EncodeLengthDelimitedProtoField,
7+
};
128
use ibc_core::client::types::Height;
139

1410
use crate::header::{SignedStarknetHeader, StarknetHeader};

‎light-client/ibc-client-starknet-types/src/header.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use cgp::prelude::*;
1+
use hermes_prelude::*;
22
use ibc_core::client::types::Height;
33

44
use crate::StarknetConsensusState;

0 commit comments

Comments
 (0)