fix script verification stop error

nervosnetwork · Jan 18, 2024 · 246363a · 246363a
1 parent 54c36ec
commit 246363a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/script/src/verify.rs b/script/src/verify.rs
@@ -1451,10 +1451,7 @@ async fn run_vms_child(
         let _ = child_rx.changed().await;
         match *child_rx.borrow() {
             ChunkCommand::Stop => {
-                let exit = (
-                    Err(ckb_vm::Error::Unexpected("stopped".to_string())),
-                    cycles,
-                );
+                let exit = (Err(ckb_vm::Error::External("stopped".into())), cycles);
                 let _ = finish_tx.send(exit);
                 return;
             }
@@ -1517,9 +1514,7 @@ async fn run_vms_child(
                 _ => {
                     // other error happened here, for example CyclesExceeded,
                     // we need to return as verification failed
-                    finish_tx
-                        .send((res, machine.cycles()))
-                        .expect("send finished");
+                    finish_tx.send((res, machine.cycles())).expect("send error");
                     return;
                 }
             };

diff --git a/script/src/verify/tests/ckb_latest/features_since_v2023.rs b/script/src/verify/tests/ckb_latest/features_since_v2023.rs
@@ -780,7 +780,7 @@ async fn check_spawn_suspend_shutdown() {
         .await;
     assert!(res.is_err());
     let err = res.unwrap_err().to_string();
-    assert!(err.contains("VM Internal Error: Unexpected(\"stopped\")"));
+    assert!(err.contains("VM Internal Error: External(\"stopped\")"));
 }
 
 #[test]