refactor: switch to metadata system contract

Peter Zhang · Peter Zhang · commit 1a3fbd6b0e76 · 2023-04-03T14:20:41.000+08:00
diff --git a/core/executor/src/system_contract/mod.rs b/core/executor/src/system_contract/mod.rs
@@ -103,7 +103,7 @@ pub fn init<P: AsRef<Path>, Adapter: ExecutorAdapter>(
         ImageCellContract::default()
             .save_cells(vec![always_success_script_deploy_cell()], 0)
             .unwrap();
-        return update_mpt_root(adapter, CkbLightClientContract::ADDRESS);
+        return update_mpt_root(adapter, ImageCellContract::ADDRESS);
     }
 
     CURRENT_HEADER_CELL_ROOT.store(Arc::new(current_cell_root));
diff --git a/core/executor/src/tests/system_script/ckb_lc_and_ic.rs b/core/executor/src/tests/system_script/ckb_lc_and_ic.rs
@@ -0,0 +1,7 @@
+use super::{ckb_light_client, image_cell};
+
+#[test]
+fn test_ckb_light_client_and_image_cell() {
+    ckb_light_client::test_write_functions();
+    image_cell::test_write_functions();
+}
diff --git a/core/executor/src/tests/system_script/ckb_light_client.rs b/core/executor/src/tests/system_script/ckb_light_client.rs
@@ -13,8 +13,7 @@ use crate::tests::{gen_tx, gen_vicinity};
 
 static ROCKSDB_PATH: &str = "./free-space/system-contract/ckb-light-client";
 
-#[test]
-fn test_write_functions() {
+pub fn test_write_functions() {
     let vicinity = gen_vicinity();
     let mut backend = MemoryBackend::new(&vicinity, BTreeMap::new());
 
@@ -164,5 +163,5 @@ 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());
+    assert_eq!(ic_account.nonce, U256::one());
 }
diff --git a/core/executor/src/tests/system_script/image_cell.rs b/core/executor/src/tests/system_script/image_cell.rs
@@ -13,8 +13,7 @@ use crate::tests::{gen_tx, gen_vicinity};
 
 static ROCKSDB_PATH: &str = "./free-space/system-contract/image-cell";
 
-#[test]
-fn test_write_functions() {
+pub fn test_write_functions() {
     let vicinity = gen_vicinity();
     let mut backend = MemoryBackend::new(&vicinity, BTreeMap::new());
 
@@ -43,7 +42,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_nounce(backend, U256::from(2));
 
     let cell_key = CellKey::new([7u8; 32], 0x0);
     let get_cell = executor.get_cell(&cell_key).unwrap().unwrap();
@@ -66,7 +65,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_nounce(backend, U256::from(3));
 
     let cell_key = CellKey::new([7u8; 32], 0x0);
     let get_cell = executor.get_cell(&cell_key).unwrap().unwrap();
diff --git a/core/executor/src/tests/system_script/mod.rs b/core/executor/src/tests/system_script/mod.rs
@@ -1,3 +1,4 @@
+mod ckb_lc_and_ic;
 mod ckb_light_client;
 mod image_cell;
 mod metadata;

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ pub fn init<P: AsRef<Path>, Adapter: ExecutorAdapter>(`
`103`	`103`	`ImageCellContract::default()`
`104`	`104`	`.save_cells(vec![always_success_script_deploy_cell()], 0)`
`105`	`105`	`.unwrap();`
`106`		`- return update_mpt_root(adapter, CkbLightClientContract::ADDRESS);`
	`106`	`+ return update_mpt_root(adapter, ImageCellContract::ADDRESS);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`CURRENT_HEADER_CELL_ROOT.store(Arc::new(current_cell_root));`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+mod ckb_lc_and_ic;`
`1`	`2`	`mod ckb_light_client;`
`2`	`3`	`mod image_cell;`
`3`	`4`	`mod metadata;`