cleanup & fixes

RegionX-Labs · May 15, 2024 · aa0352e · aa0352e
1 parent 29574a8
commit aa0352e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/regions/src/lib.rs b/pallets/regions/src/lib.rs
@@ -153,6 +153,8 @@ pub mod pallet {
 		NotUnavailable,
 		/// The given region id is not valid.
 		InvalidRegionId,
+		/// Failed to get the latest height of the Coretime chain.
+		LatestHeightInaccessible,
 	}
 
 	#[pallet::call]
@@ -238,10 +240,11 @@ pub mod pallet {
 			let key = [pallet_hash, storage_hash, region_id_hash, region_id_encoded].concat();
 
 			let coretime_chain_height =
-				T::StateMachineHeightProvider::get_latest_state_machine_height(StateMachineId {
+				T::StateMachineHeightProvider::latest_state_machine_height(StateMachineId {
 					state_id: T::CoretimeChain::get(),
 					consensus_state_id: PARACHAIN_CONSENSUS_ID,
-				});
+				})
+				.ok_or(Error::<T>::LatestHeightInaccessible)?;
 
 			// TODO: should requests be coupled in the future?
 			let get = DispatchGet {

diff --git a/pallets/regions/src/mock.rs b/pallets/regions/src/mock.rs
@@ -90,8 +90,8 @@ parameter_types! {
 
 pub struct MockStateMachineHeightProvider;
 impl StateMachineHeightProvider for MockStateMachineHeightProvider {
-	fn get_latest_state_machine_height(_id: StateMachineId) -> u64 {
-		0
+	fn latest_state_machine_height(_id: StateMachineId) -> Option<u64> {
+		Some(0)
 	}
 }
 

diff --git a/pallets/regions/src/primitives.rs b/pallets/regions/src/primitives.rs
@@ -17,5 +17,5 @@ use ismp::consensus::StateMachineId;
 
 pub trait StateMachineHeightProvider {
 	/// Return the latest height of the state machine
-	fn get_latest_state_machine_height(id: StateMachineId) -> u64;
+	fn latest_state_machine_height(id: StateMachineId) -> Option<u64>;
 }
diff --git a/pallets/regions/src/tests.rs b/pallets/regions/src/tests.rs
@@ -277,7 +277,7 @@ fn on_timeout_works() {
 		invalid_get_req.keys.push(vec![0u8; 15]);
 		assert_err!(
 			module.on_timeout(Timeout::Request(Request::Get(invalid_get_req.clone()))),
-			IsmpCustomError::DecodeFailed
+			IsmpCustomError::KeyDecodeFailed
 		);
 
 		// invalid id: region not found

diff --git a/runtime/regionx/src/lib.rs b/runtime/regionx/src/lib.rs
@@ -596,8 +596,8 @@ impl pallet_collator_selection::Config for Runtime {
 
 pub struct StateMachineHeightProvider;
 impl StateMachineHeightProviderT for StateMachineHeightProvider {
-	fn get_latest_state_machine_height(id: StateMachineId) -> u64 {
-		Ismp::latest_state_machine_height(id).unwrap_or(0) // TODO
+	fn latest_state_machine_height(id: StateMachineId) -> Option<u64> {
+		Ismp::latest_state_machine_height(id)
 	}
 }