change(executor): cancel will not revert current execution unit changes

We can still use panic to revert changes
nervosnetwork · Jun 11, 2020 · 548d621 · 548d621
1 parent b04cfad
commit 548d621
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/framework/src/executor/mod.rs b/framework/src/executor/mod.rs
@@ -115,12 +115,12 @@ impl<DB: TrieDB> CommitHooks<DB> {
         match panic::catch_unwind(AssertUnwindSafe(hook)) {
             Ok(_) if !context.canceled() => states.stash(),
             Ok(_) => {
+                states.stash()?;
+
                 // An reason must be passed to cancel
                 let reason = context.cancel_reason();
                 debug_assert!(reason.is_some());
 
-                states.revert_cache()?;
-
                 Err(ExecutorError::Canceled {
                     service: context.get_service_name().to_owned(),
                     reason,

diff --git a/framework/src/executor/tests/mod.rs b/framework/src/executor/tests/mod.rs
@@ -498,7 +498,7 @@ fn test_tx_hook_before_cancel() {
     let caller = Address::from_hex("0xf8389d774afdad8755ef8e629e5a154fddc6325a").unwrap();
 
     let before = read!(executor, &params, &caller, r#""before""#);
-    assert_eq!(before.succeed_data, r#""""#);
+    assert_eq!(before.succeed_data, r#""before""#);
 
     let tx_hook_before_cancel = read!(executor, &params, &caller, r#""tx_hook_before_cancel""#);
     assert_eq!(tx_hook_before_cancel.succeed_data, r#""""#);