[vm] log the location when prologue error

starcoinorg · Jul 29, 2022 · f410bec · f410bec
1 parent 6f695fd
commit f410bec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/sync/src/block_connector/test_illegal_block.rs b/sync/src/block_connector/test_illegal_block.rs
@@ -300,7 +300,7 @@ async fn test_verify_consensus_failed() {
     }
 }
 
-#[stest::test]
+#[stest::test(timeout = 120)]
 async fn test_verify_new_epoch_block_uncle_should_none_failed() {
     let apply_failed = test_verify_uncles_in_old_epoch(true).await;
     assert!(apply_failed.is_err());
@@ -727,7 +727,7 @@ async fn test_verify_uncles_in_old_epoch(begin_epoch: bool) -> Result<Block> {
     )
 }
 
-#[stest::test]
+#[stest::test(timeout = 120)]
 async fn test_verify_uncles_in_old_epoch_failed() {
     let apply_failed = test_verify_uncles_in_old_epoch(false).await;
     assert!(apply_failed.is_err());
@@ -736,7 +736,7 @@ async fn test_verify_uncles_in_old_epoch_failed() {
     }
 }
 
-#[stest::test]
+#[stest::test(timeout = 120)]
 async fn test_verify_uncles_uncle_exist_failed() {
     let count = 5;
     let (uncle_header, mut writeable_block_chain_service, node_config, storage) =
@@ -860,7 +860,7 @@ async fn test_verify_uncle_and_parent_number_failed() {
     }
 }
 
-#[stest::test]
+#[stest::test(timeout = 120)]
 async fn test_verify_uncle_which_parent_is_end_block_in_last_epoch() {
     let count = G_TEST_CONFIG.consensus_config.epoch_block_count;
     let (uncle_header, mut writeable_block_chain_service, node_config, storage) =

diff --git a/vm/vm-runtime/src/errors.rs b/vm/vm-runtime/src/errors.rs
@@ -44,7 +44,7 @@ pub fn convert_prologue_runtime_error(error: VMError) -> Result<(), VMStatus> {
     let status = error.into_vm_status();
     Err(match status {
         VMStatus::Executed => VMStatus::Executed,
-        VMStatus::MoveAbort(_location, code) => {
+        VMStatus::MoveAbort(location, code) => {
             let (category, reason) = error_split(code);
             let new_major_status = match (category, reason) {
                 (REQUIRES_ADDRESS, PROLOGUE_ACCOUNT_DOES_NOT_EXIST) => {
@@ -88,8 +88,8 @@ pub fn convert_prologue_runtime_error(error: VMError) -> Result<(), VMStatus> {
                 }
                 (category, reason) => {
                     warn!(
-                        "prologue runtime unknown: category({}), reason:({})",
-                        category, reason
+                        "prologue runtime unknown: category({}), reason:({}), location:({})",
+                        category, reason, location
                     );
                     StatusCode::UNEXPECTED_ERROR_FROM_KNOWN_MOVE_FUNCTION
                 }