Use u32 as consensus chain block number in pallet-domains tests

NingLin-P · NingLin-P · commit 3a2333ce6e14 · 2025-05-17T03:56:33.000+08:00
This is used to keep consistent with the production runtime

Signed-off-by: linning &lt;linningde25@gmail.com&gt;
diff --git a/crates/pallet-domains/src/block_tree.rs b/crates/pallet-domains/src/block_tree.rs
@@ -692,7 +692,7 @@ mod tests {
             );
             let mut receipt_of_block_1 = None;
             let mut bundle_header_hash_of_block_1 = None;
-            for block_number in 1..=(block_tree_pruning_depth as u64 + 3) {
+            for block_number in 1..=(block_tree_pruning_depth + 3) {
                 // Finilize parent block and initialize block at `block_number`
                 run_to_block::<Test>(block_number, receipt.consensus_block_hash);
 
@@ -726,7 +726,7 @@ mod tests {
                 ));
                 // `bundle_extrinsics_root` should be tracked in `ExecutionInbox`
                 assert_eq!(
-                    ExecutionInbox::<Test>::get((domain_id, block_number as u32, block_number)),
+                    ExecutionInbox::<Test>::get((domain_id, block_number, block_number)),
                     vec![BundleDigest {
                         header_hash: bundle_header_hash,
                         extrinsics_root: bundle_extrinsics_root,
@@ -739,7 +739,7 @@ mod tests {
 
                 // Head receipt number should be updated
                 let head_receipt_number = HeadReceiptNumber::<Test>::get(domain_id);
-                assert_eq!(head_receipt_number, block_number as u32 - 1);
+                assert_eq!(head_receipt_number, block_number - 1);
 
                 // As we only extending the block tree there should be no fork
                 let parent_domain_block_receipt =
@@ -1035,7 +1035,7 @@ mod tests {
             // Construct a future receipt
             let mut future_receipt = next_receipt.clone();
             future_receipt.domain_block_number = head_receipt_number + 2;
-            future_receipt.consensus_block_number = head_receipt_number as u64 + 2;
+            future_receipt.consensus_block_number = head_receipt_number as u32 + 2;
             ExecutionInbox::<Test>::insert(
                 (
                     domain_id,
@@ -1127,7 +1127,7 @@ mod tests {
             // Construct a future receipt
             let mut future_receipt = next_receipt.clone();
             future_receipt.domain_block_number = head_receipt_number + 1;
-            future_receipt.consensus_block_number = head_receipt_number as u64 + 1;
+            future_receipt.consensus_block_number = head_receipt_number as u32 + 1;
 
             ExecutionInbox::<Test>::insert(
                 (
@@ -1222,7 +1222,7 @@ mod tests {
     #[test]
     fn test_collect_invalid_bundle_author() {
         let creator = 0u128;
-        let challenge_period = BlockTreePruningDepth::get() as u64;
+        let challenge_period = BlockTreePruningDepth::get();
         let operator_set: Vec<_> = (1..15).collect();
         let mut ext = new_test_ext_with_extensions();
         ext.execute_with(|| {
@@ -1250,7 +1250,7 @@ mod tests {
             let current_block_number = frame_system::Pallet::<Test>::current_block_number();
             let execution_inbox = ExecutionInbox::<Test>::get((
                 domain_id,
-                current_block_number as u32,
+                current_block_number,
                 current_block_number,
             ));
             let bundles_extrinsics_roots: Vec<_> = execution_inbox
@@ -1289,7 +1289,7 @@ mod tests {
             let next_receipt = extend_block_tree(
                 domain_id,
                 operator_set[0],
-                (current_block_number + challenge_period) as u32 + 1,
+                current_block_number + challenge_period + 1u32,
                 target_receipt,
             );
             // Confirm `target_receipt`
diff --git a/crates/pallet-domains/src/domain_registry.rs b/crates/pallet-domains/src/domain_registry.rs
@@ -401,7 +401,7 @@ mod tests {
     #[test]
     fn test_domain_instantiation() {
         let creator = 1u128;
-        let created_at = 0u64;
+        let created_at = 0u32;
         // Construct an invalid domain config initially
         let mut domain_config_params = DomainConfigParams {
             domain_name: String::from_utf8(vec![0; 1024]).unwrap(),
@@ -562,7 +562,7 @@ mod tests {
     #[test]
     fn test_domain_instantiation_evm_accounts() {
         let creator = 1u128;
-        let created_at = 0u64;
+        let created_at = 0u32;
         // Construct an invalid domain config initially
         let mut domain_config_params = DomainConfigParams {
             domain_name: "evm-domain".to_owned(),
@@ -729,7 +729,7 @@ mod tests {
     #[test]
     fn test_domain_instantiation_evm_contract_allow_list() {
         let creator = 1u128;
-        let created_at = 0u64;
+        let created_at = 0u32;
         // Construct a valid default domain config
         let mut domain_config_params = DomainConfigParams {
             domain_name: "evm-domain".to_owned(),
diff --git a/crates/pallet-domains/src/runtime_registry.rs b/crates/pallet-domains/src/runtime_registry.rs
@@ -501,7 +501,7 @@ mod tests {
             ));
 
             ext.execute_with(|| {
-                frame_system::Pallet::<Test>::set_block_number(100u64);
+                frame_system::Pallet::<Test>::set_block_number(100u32);
                 let res = crate::Pallet::<Test>::upgrade_domain_runtime(
                     RawOrigin::Root.into(),
                     0,
@@ -514,7 +514,7 @@ mod tests {
 
         // will not be able to override an already scheduled upgrade
         ext.execute_with(|| {
-            frame_system::Pallet::<Test>::set_block_number(100u64);
+            frame_system::Pallet::<Test>::set_block_number(100u32);
             let res = crate::Pallet::<Test>::upgrade_domain_runtime(
                 RawOrigin::Root.into(),
                 0,
@@ -562,7 +562,7 @@ mod tests {
         })
     }
 
-    fn go_to_block(block: u64) {
+    fn go_to_block(block: u32) {
         for i in System::block_number() + 1..=block {
             let parent_hash = if System::block_number() > 1 {
                 let header = System::finalize();
diff --git a/crates/pallet-domains/src/tests.rs b/crates/pallet-domains/src/tests.rs
@@ -47,7 +47,7 @@ use subspace_runtime_primitives::{
 };
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
-type Block = frame_system::mocking::MockBlock<Test>;
+type Block = frame_system::mocking::MockBlockU32<Test>;
 type Balance = u128;
 
 // TODO: Remove when DomainRegistry is usable.
@@ -67,7 +67,7 @@ frame_support::construct_runtime!(
     }
 );
 
-type BlockNumber = u64;
+type BlockNumber = u32;
 type Hash = H256;
 pub(crate) type AccountId = u128;
 
@@ -189,7 +189,7 @@ impl BlockSlot<Test> for DummyBlockSlot {
     }
 
     fn slot_produced_after(_slot: sp_consensus_slots::Slot) -> Option<BlockNumberFor<Test>> {
-        Some(0u64)
+        Some(0u32)
     }
 }
 
@@ -513,9 +513,9 @@ pub(crate) fn extend_block_tree(
     mut latest_receipt: ExecutionReceiptOf<Test>,
 ) -> ExecutionReceiptOf<Test> {
     let current_block_number = frame_system::Pallet::<Test>::current_block_number();
-    assert!(current_block_number < to as u64);
+    assert!(current_block_number < to);
 
-    for block_number in (current_block_number + 1)..to as u64 {
+    for block_number in (current_block_number + 1)..to {
         // Finilize parent block and initialize block at `block_number`
         run_to_block::<Test>(block_number, latest_receipt.consensus_block_hash);
 
@@ -547,7 +547,7 @@ pub(crate) fn extend_block_tree(
     }
 
     // Finilize parent block and initialize block at `to`
-    run_to_block::<Test>(to as u64, latest_receipt.consensus_block_hash);
+    run_to_block::<Test>(to, latest_receipt.consensus_block_hash);
 
     latest_receipt
 }
@@ -810,13 +810,11 @@ fn test_basic_fraud_proof_processing() {
 
                 // The other data that used to verify ER should not be removed, such that the honest
                 // operator can re-submit the valid ER
-                assert!(!ExecutionInbox::<Test>::get((
-                    domain_id,
-                    block_number,
-                    block_number as u64
-                ))
-                .is_empty());
-                assert!(ConsensusBlockHash::<Test>::get(domain_id, block_number as u64).is_some());
+                assert!(
+                    !ExecutionInbox::<Test>::get((domain_id, block_number, block_number))
+                        .is_empty()
+                );
+                assert!(ConsensusBlockHash::<Test>::get(domain_id, block_number).is_some());
             }
 
             // Re-submit the valid ER
