ISMP dependency update (#89)

RegionX-Labs · Apr 20, 2024 · 3b26a94 · 3b26a94
1 parent 83c3269
commit 3b26a94
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -136,12 +136,12 @@ orml-asset-registry = { version = "0.7.0", default-features = false }
 orml-traits = { version = "0.7.0", default-features = false }
 
 # Polytope Labs
-ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-pallet-ismp = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain-inherent = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
-ismp-parachain-runtime-api = { git="https://github.com/Szegoo/hyperbridge.git", branch="fix-try-runtime", default-features = false }
+ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+pallet-ismp = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain-inherent = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+pallet-ismp-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
+ismp-parachain-runtime-api = { git="https://github.com/polytope-labs/hyperbridge.git", branch="main", default-features = false }
 
 # Local
 regionx-primitives = { path = "./runtime/primitives", default-features = false }

diff --git a/runtime/regionx/Cargo.toml b/runtime/regionx/Cargo.toml
@@ -26,7 +26,7 @@ regionx-primitives = { workspace = true }
 ismp = { workspace = true, default-features = false }
 pallet-ismp = { workspace = true, default-features = false }
 ismp-parachain = { workspace = true, default-features = false }
-ismp-runtime-api = { workspace = true, default-features = false }
+pallet-ismp-runtime-api = { workspace = true, default-features = false }
 ismp-parachain-runtime-api = { workspace = true, default-features = false }
 
 # Orml
@@ -103,7 +103,7 @@ std = [
 	"cumulus-primitives-utility/std",
 	"ismp/std",
 	"pallet-ismp/std",
-	"ismp-runtime-api/std",
+	"pallet-ismp-runtime-api/std",
 	"ismp-parachain/std",
 	"ismp-parachain-runtime-api/std",
 	"frame-benchmarking?/std",

diff --git a/runtime/regionx/src/ismp.rs b/runtime/regionx/src/ismp.rs
@@ -56,7 +56,6 @@ impl pallet_ismp::Config for Runtime {
 	type TimeProvider = Timestamp;
 	type Router = Router;
 	type ConsensusClients = (ParachainConsensusClient<Runtime, IsmpParachain>,);
-	type WeightInfo = ();
 	type WeightProvider = ();
 }
 

diff --git a/runtime/regionx/src/lib.rs b/runtime/regionx/src/lib.rs
@@ -74,7 +74,7 @@ use frame_system::{
 	EnsureRoot, EnsureSigned, Phase,
 };
 use pallet_ismp::{
-	mmr_primitives::{Leaf, LeafIndex},
+	mmr::primitives::{Leaf, LeafIndex},
 	primitives::Proof,
 	ProofKeys,
 };
@@ -809,7 +809,7 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl ismp_runtime_api::IsmpRuntimeApi<Block, <Block as BlockT>::Hash> for Runtime {
+	impl pallet_ismp_runtime_api::IsmpRuntimeApi<Block, <Block as BlockT>::Hash> for Runtime {
 		/// Return the number of MMR leaves.
 		fn mmr_leaf_count() -> Result<LeafIndex, pallet_ismp::primitives::Error> {
 			Ok(Ismp::mmr_leaf_count())