fix unit tests

Eason · Eason · commit b978daef5ced · 2023-04-01T11:43:40.000+08:00
diff --git a/core/executor/src/tests/system_script/ckb_light_client.rs b/core/executor/src/tests/system_script/ckb_light_client.rs
@@ -62,7 +62,7 @@ fn test_update_first(backend: &mut MemoryBackend, executor: &CkbLightClientContr
     assert!(r.exit_reason.is_succeed());
 
     check_root(backend, executor);
-    check_nounce(backend, U256::one());
+    check_nonce(backend, 1);
 
     let queried_header = executor
         .get_header_by_block_hash(&H256::default())
@@ -85,7 +85,7 @@ fn test_update_second(backend: &mut MemoryBackend, executor: &CkbLightClientCont
     assert!(r.exit_reason.is_succeed());
 
     check_root(backend, executor);
-    check_nounce(backend, U256::from(2));
+    check_nonce(backend, 2);
 
     let queried_header = executor
         .get_header_by_block_hash(&H256::from_slice(&header.block_hash))
@@ -160,9 +160,19 @@ fn check_root(backend: &MemoryBackend, executor: &CkbLightClientContract) {
     );
 }
 
-fn check_nounce(backend: &mut MemoryBackend, nounce: U256) {
-    let ckb_account = backend.basic(CkbLightClientContract::ADDRESS);
-    let ic_account = backend.basic(ImageCellContract::ADDRESS);
-    assert_eq!(ckb_account.nonce, nounce);
-    assert_eq!(ic_account.nonce, U256::zero());
+fn check_nonce(backend: &mut MemoryBackend, nonce: u64) {
+    assert_eq!(
+        backend.basic(CkbLightClientContract::ADDRESS).nonce,
+        U256::zero()
+    );
+    assert_eq!(
+        backend.basic(ImageCellContract::ADDRESS).nonce,
+        U256::zero()
+    );
+    assert_eq!(
+        backend
+            .basic(H160::from_str("0xf000000000000000000000000000000000000000").unwrap())
+            .nonce,
+        nonce.into()
+    )
 }
diff --git a/core/executor/src/tests/system_script/image_cell.rs b/core/executor/src/tests/system_script/image_cell.rs
@@ -43,7 +43,7 @@ fn test_update_first(backend: &mut MemoryBackend, executor: &ImageCellContract)
     assert!(r.exit_reason.is_succeed());
 
     check_root(backend, executor);
-    check_nounce(backend, U256::one());
+    check_nonce(backend, 1);
 
     let cell_key = CellKey::new([7u8; 32], 0x0);
     let get_cell = executor.get_cell(&cell_key).unwrap().unwrap();
@@ -66,7 +66,7 @@ fn test_update_second(backend: &mut MemoryBackend, executor: &ImageCellContract)
     assert!(r.exit_reason.is_succeed());
 
     check_root(backend, executor);
-    check_nounce(backend, U256::from(2));
+    check_nonce(backend, 2);
 
     let cell_key = CellKey::new([7u8; 32], 0x0);
     let get_cell = executor.get_cell(&cell_key).unwrap().unwrap();
@@ -210,10 +210,19 @@ fn prepare_outputs() -> Vec<image_cell_abi::CellInfo> {
     }]
 }
 
-fn check_nounce(backend: &mut MemoryBackend, nounce: U256) {
-    let ic_account = backend.basic(ImageCellContract::ADDRESS);
-    let ckb_account = backend.basic(CkbLightClientContract::ADDRESS);
-
-    assert_eq!(ic_account.nonce, nounce);
-    assert_eq!(ckb_account.nonce, U256::zero());
+fn check_nonce(backend: &mut MemoryBackend, nonce: u64) {
+    assert_eq!(
+        backend.basic(CkbLightClientContract::ADDRESS).nonce,
+        U256::zero()
+    );
+    assert_eq!(
+        backend.basic(ImageCellContract::ADDRESS).nonce,
+        U256::zero()
+    );
+    assert_eq!(
+        backend
+            .basic(H160::from_str("0xf000000000000000000000000000000000000000").unwrap())
+            .nonce,
+        nonce.into()
+    )
 }
