Merge peg/dont-mock-propagation, lower test reshare block number

entropyxyz · Nov 26, 2024 · 6aeb958 · 6aeb958
2 parents 6b66e65 + 4f57bde
commit 6aeb958
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/crates/shared/src/constants.rs b/crates/shared/src/constants.rs
@@ -75,7 +75,7 @@ pub const MAX_SIGNERS: u8 = 15;
 pub const SIGNER_THRESHOLD: u8 = 2;
 
 /// For testing to line up chain mock data and reshare_test
-pub const TEST_RESHARE_BLOCK_NUMBER: u32 = 11;
+pub const TEST_RESHARE_BLOCK_NUMBER: u32 = 10;
 
 /// Program version number, must be incremented if version number changes
 pub const PROGRAM_VERSION_NUMBER: u8 = 0;
diff --git a/pallets/propagation/src/lib.rs b/pallets/propagation/src/lib.rs
@@ -160,7 +160,7 @@ pub mod pallet {
         /// Submits a request to do a key refresh on the signers parent key.
         pub fn post_reshare(block_number: BlockNumberFor<T>) -> Result<(), http::Error> {
             let reshare_data = pallet_staking_extension::Pallet::<T>::reshare_data();
-            if reshare_data.block_number != block_number {
+            if reshare_data.block_number + sp_runtime::traits::One::one() != block_number {
                 return Ok(());
             }
 

diff --git a/pallets/staking/src/lib.rs b/pallets/staking/src/lib.rs
@@ -793,7 +793,7 @@ pub mod pallet {
             // trigger reshare at next block
             let current_block_number = <frame_system::Pallet<T>>::block_number();
             let reshare_info = ReshareInfo {
-                block_number: current_block_number + sp_runtime::traits::One::one(),
+                block_number: current_block_number - sp_runtime::traits::One::one(),
                 new_signers,
             };