revert some debug code (aptos-labs#12504)

zjma · web-flow · commit 19869cbe8e93 · 2024-03-13T06:48:08.000-07:00
diff --git a/aptos-move/framework/aptos-framework/doc/block.md b/aptos-move/framework/aptos-framework/doc/block.md
@@ -40,7 +40,6 @@ This module defines a struct storing the metadata of the block and new block eve
 
 
 <pre><code><b>use</b> <a href="account.md#0x1_account">0x1::account</a>;
-<b>use</b> <a href="../../aptos-stdlib/doc/debug.md#0x1_debug">0x1::debug</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">0x1::error</a>;
 <b>use</b> <a href="event.md#0x1_event">0x1::event</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
@@ -50,7 +49,6 @@ This module defines a struct storing the metadata of the block and new block eve
 <b>use</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg">0x1::reconfiguration_with_dkg</a>;
 <b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
 <b>use</b> <a href="state_storage.md#0x1_state_storage">0x1::state_storage</a>;
-<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string">0x1::string</a>;
 <b>use</b> <a href="system_addresses.md#0x1_system_addresses">0x1::system_addresses</a>;
 <b>use</b> <a href="../../aptos-stdlib/doc/table_with_length.md#0x1_table_with_length">0x1::table_with_length</a>;
 <b>use</b> <a href="timestamp.md#0x1_timestamp">0x1::timestamp</a>;
@@ -582,7 +580,6 @@ The runtime always runs this before executing the transactions in a block.
     <a href="timestamp.md#0x1_timestamp">timestamp</a>: u64,
     randomness_seed: Option&lt;<a href="../../aptos-stdlib/../move-stdlib/doc/vector.md#0x1_vector">vector</a>&lt;u8&gt;&gt;,
 ) <b>acquires</b> <a href="block.md#0x1_block_BlockResource">BlockResource</a>, <a href="block.md#0x1_block_CommitHistory">CommitHistory</a> {
-    <a href="../../aptos-stdlib/doc/debug.md#0x1_debug_print">debug::print</a>(&utf8(b"0312 - block_prologue_ext begin"));
     <b>let</b> epoch_interval = <a href="block.md#0x1_block_block_prologue_common">block_prologue_common</a>(
         &vm,
         <a href="../../aptos-stdlib/../move-stdlib/doc/hash.md#0x1_hash">hash</a>,
@@ -598,7 +595,6 @@ The runtime always runs this before executing the transactions in a block.
     <b>if</b> (<a href="timestamp.md#0x1_timestamp">timestamp</a> - <a href="reconfiguration.md#0x1_reconfiguration_last_reconfiguration_time">reconfiguration::last_reconfiguration_time</a>() &gt;= epoch_interval) {
         <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">reconfiguration_with_dkg::try_start</a>();
     };
-    <a href="../../aptos-stdlib/doc/debug.md#0x1_debug_print">debug::print</a>(&utf8(b"0312 - block_prologue_ext end"))
 }
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/doc/reconfiguration_with_dkg.md b/aptos-move/framework/aptos-framework/doc/reconfiguration_with_dkg.md
@@ -16,7 +16,6 @@ Reconfiguration with DKG helper functions.
 
 
 <pre><code><b>use</b> <a href="consensus_config.md#0x1_consensus_config">0x1::consensus_config</a>;
-<b>use</b> <a href="../../aptos-stdlib/doc/debug.md#0x1_debug">0x1::debug</a>;
 <b>use</b> <a href="dkg.md#0x1_dkg">0x1::dkg</a>;
 <b>use</b> <a href="execution_config.md#0x1_execution_config">0x1::execution_config</a>;
 <b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/features.md#0x1_features">0x1::features</a>;
@@ -28,7 +27,6 @@ Reconfiguration with DKG helper functions.
 <b>use</b> <a href="reconfiguration.md#0x1_reconfiguration">0x1::reconfiguration</a>;
 <b>use</b> <a href="reconfiguration_state.md#0x1_reconfiguration_state">0x1::reconfiguration_state</a>;
 <b>use</b> <a href="stake.md#0x1_stake">0x1::stake</a>;
-<b>use</b> <a href="../../aptos-stdlib/../move-stdlib/doc/string.md#0x1_string">0x1::string</a>;
 <b>use</b> <a href="validator_consensus_info.md#0x1_validator_consensus_info">0x1::validator_consensus_info</a>;
 <b>use</b> <a href="version.md#0x1_version">0x1::version</a>;
 </code></pre>
@@ -53,12 +51,10 @@ Do nothing if one is already in progress.
 
 
 <pre><code><b>public</b>(<b>friend</b>) <b>fun</b> <a href="reconfiguration_with_dkg.md#0x1_reconfiguration_with_dkg_try_start">try_start</a>() {
-    <a href="../../aptos-stdlib/doc/debug.md#0x1_debug_print">debug::print</a>(&utf8(b"0312 - try_start begin"));
     <b>let</b> incomplete_dkg_session = <a href="dkg.md#0x1_dkg_incomplete_session">dkg::incomplete_session</a>();
     <b>if</b> (<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_is_some">option::is_some</a>(&incomplete_dkg_session)) {
         <b>let</b> session = <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_borrow">option::borrow</a>(&incomplete_dkg_session);
         <b>if</b> (<a href="dkg.md#0x1_dkg_session_dealer_epoch">dkg::session_dealer_epoch</a>(session) == <a href="reconfiguration.md#0x1_reconfiguration_current_epoch">reconfiguration::current_epoch</a>()) {
-            <a href="../../aptos-stdlib/doc/debug.md#0x1_debug_print">debug::print</a>(&utf8(b"0312 - try_start <b>abort</b>"));
             <b>return</b>
         }
     };
@@ -70,7 +66,6 @@ Do nothing if one is already in progress.
         <a href="stake.md#0x1_stake_cur_validator_consensus_infos">stake::cur_validator_consensus_infos</a>(),
         <a href="stake.md#0x1_stake_next_validator_consensus_infos">stake::next_validator_consensus_infos</a>(),
     );
-    <a href="../../aptos-stdlib/doc/debug.md#0x1_debug_print">debug::print</a>(&utf8(b"0312 - try_start end"))
 }
 </code></pre>
 
diff --git a/aptos-move/framework/aptos-framework/sources/block.move b/aptos-move/framework/aptos-framework/sources/block.move
@@ -6,8 +6,6 @@ module aptos_framework::block {
     use std::option;
     use aptos_std::table_with_length::{Self, TableWithLength};
     use std::option::Option;
-    use std::string::utf8;
-    use aptos_std::debug;
     use aptos_framework::randomness;
 
     use aptos_framework::account;
@@ -215,7 +213,6 @@ module aptos_framework::block {
         timestamp: u64,
         randomness_seed: Option<vector<u8>>,
     ) acquires BlockResource, CommitHistory {
-        debug::print(&utf8(b"0312 - block_prologue_ext begin"));
         let epoch_interval = block_prologue_common(
             &vm,
             hash,
@@ -231,7 +228,6 @@ module aptos_framework::block {
         if (timestamp - reconfiguration::last_reconfiguration_time() >= epoch_interval) {
             reconfiguration_with_dkg::try_start();
         };
-        debug::print(&utf8(b"0312 - block_prologue_ext end"))
     }
 
     #[view]
diff --git a/aptos-move/framework/aptos-framework/sources/reconfiguration_with_dkg.move b/aptos-move/framework/aptos-framework/sources/reconfiguration_with_dkg.move
@@ -2,8 +2,6 @@
 module aptos_framework::reconfiguration_with_dkg {
     use std::features;
     use std::option;
-    use std::string::utf8;
-    use aptos_std::debug;
     use aptos_framework::consensus_config;
     use aptos_framework::dkg;
     use aptos_framework::execution_config;
@@ -20,12 +18,10 @@ module aptos_framework::reconfiguration_with_dkg {
     /// Trigger a reconfiguration with DKG.
     /// Do nothing if one is already in progress.
     public(friend) fun try_start() {
-        debug::print(&utf8(b"0312 - try_start begin"));
         let incomplete_dkg_session = dkg::incomplete_session();
         if (option::is_some(&incomplete_dkg_session)) {
             let session = option::borrow(&incomplete_dkg_session);
             if (dkg::session_dealer_epoch(session) == reconfiguration::current_epoch()) {
-                debug::print(&utf8(b"0312 - try_start abort"));
                 return
             }
         };
@@ -37,7 +33,6 @@ module aptos_framework::reconfiguration_with_dkg {
             stake::cur_validator_consensus_infos(),
             stake::next_validator_consensus_infos(),
         );
-        debug::print(&utf8(b"0312 - try_start end"))
     }
 
     /// Clear incomplete DKG session, if it exists.
diff --git a/aptos-move/framework/src/natives/debug.rs b/aptos-move/framework/src/natives/debug.rs
@@ -32,13 +32,15 @@ fn native_print(
     debug_assert!(ty_args.is_empty());
     debug_assert!(args.len() == 1);
 
-    let val = safely_pop_arg!(args, Struct);
-    let bytes = val.unpack()?.next().unwrap();
+    if cfg!(feature = "testing") {
+        let val = safely_pop_arg!(args, Struct);
+        let bytes = val.unpack()?.next().unwrap();
 
-    println!(
-        "[debug] {}",
-        std::str::from_utf8(&bytes.value_as::<Vec<u8>>()?).unwrap()
-    );
+        println!(
+            "[debug] {}",
+            std::str::from_utf8(&bytes.value_as::<Vec<u8>>()?).unwrap()
+        );
+    }
 
     Ok(smallvec![])
 }
diff --git a/types/src/contract_event.rs b/types/src/contract_event.rs
@@ -311,9 +311,7 @@ impl TryFrom<&ContractEvent> for DKGStartEvent {
                 if event.type_tag != TypeTag::Struct(Box::new(Self::struct_tag())) {
                     bail!("conversion to dkg start event failed with wrong type tag")
                 }
-                let x = bcs::from_bytes(&event.event_data).map_err(Into::into);
-                println!("0312 - ContractEvent to DKGStartEvent: {}", x.is_ok());
-                x
+                bcs::from_bytes(&event.event_data).map_err(Into::into)
             },
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,7 @@ impl TryFrom<&ContractEvent> for DKGStartEvent {`
`311`	`311`	`if event.type_tag != TypeTag::Struct(Box::new(Self::struct_tag())) {`
`312`	`312`	`bail!("conversion to dkg start event failed with wrong type tag")`
`313`	`313`	`}`
`314`		`- let x = bcs::from_bytes(&event.event_data).map_err(Into::into);`
`315`		`- println!("0312 - ContractEvent to DKGStartEvent: {}", x.is_ok());`
`316`		`- x`
	`314`	`+ bcs::from_bytes(&event.event_data).map_err(Into::into)`
`317`	`315`	`},`
`318`	`316`	`}`
`319`	`317`	`}`