misc cleanups from doing #8323

chain/client/src/test_utils.rs

@@ -1686,6 +1686,8 @@ impl TestEnv {
         self.clients[id].process_tx(tx, false, false)
     }
 
+    /// This function will actually bump to the latest protocol version instead of the provided one.
+    /// See https://github.com/near/nearcore/issues/8590 for details.
     pub fn upgrade_protocol(&mut self, protocol_version: ProtocolVersion) {
         assert_eq!(self.clients.len(), 1, "at the moment, this support only a single client");
 
@@ -1698,6 +1700,7 @@ impl TestEnv {
             self.clients[0].runtime_adapter.get_block_producer(&epoch_id, tip.height).unwrap();
 
         let mut block = self.clients[0].produce_block(tip.height + 1).unwrap().unwrap();
+        eprintln!("Producing block with version {protocol_version}");
         block.mut_header().set_latest_protocol_version(protocol_version);
         block.mut_header().resign(&create_test_signer(block_producer.as_str()));
 

core/primitives-core/src/config.rs

@@ -35,8 +35,8 @@ pub struct VMLimitConfig {
 
     /// How tall the stack is allowed to grow?
     ///
-    /// See <https://wiki.parity.io/WebAssembly-StackHeight> to find out
-    /// how the stack frame cost is calculated.
+    /// See <https://wiki.parity.io/WebAssembly-StackHeight> to find out how the stack frame cost
+    /// is calculated.
     pub max_stack_height: u32,
     /// Whether a legacy version of stack limiting should be used, see
     /// [`ContractPrepareVersion`].
@@ -46,8 +46,7 @@ pub struct VMLimitConfig {
     /// The initial number of memory pages.
     /// NOTE: It's not a limiter itself, but it's a value we use for initial_memory_pages.
     pub initial_memory_pages: u32,
-    /// What is the maximal memory pages amount is allowed to have for
-    /// a contract.
+    /// What is the maximal memory pages amount is allowed to have for a contract.
     pub max_memory_pages: u32,
 
     /// Limit of memory used by registers.

runtime/near-vm-logic/src/gas_counter.rs

@@ -40,7 +40,7 @@ pub struct FastGasCounter {
     pub burnt_gas: u64,
     /// Hard gas limit for execution
     pub gas_limit: u64,
-    /// Single WASM opcode cost
+    /// Cost for one opcode. Used only by VMs preceding near_vm.
     pub opcode_cost: u64,
 }
 
@@ -180,11 +180,6 @@ impl GasCounter {
         }
     }
 
-    pub fn pay_wasm_gas(&mut self, opcodes: u32) -> Result<()> {
-        let value = Gas::from(opcodes) * self.fast_counter.opcode_cost;
-        self.burn_gas(value)
-    }
-
     /// Very special function to get the gas counter pointer for generated machine code.
     /// Please do not use, unless fully understand Rust aliasing and other consequences.
     /// Can be used to emit inlined code like `pay_wasm_gas()`, i.e.
@@ -353,7 +348,6 @@ mod tests {
         let mut counter = make_test_counter(MAX_GAS, MAX_GAS, false);
         counter.pay_base(near_primitives::config::ExtCosts::storage_write_base).unwrap();
         counter.pay_per(near_primitives::config::ExtCosts::storage_write_value_byte, 10).unwrap();
-        counter.pay_wasm_gas(20).unwrap();
         counter
             .pay_action_accumulated(
                 100,

runtime/near-vm-runner/src/prepare.rs

@@ -47,9 +47,8 @@ pub fn prepare_contract(original_code: &[u8], config: &VMConfig) -> Result<Vec<u
 
 #[cfg(test)]
 mod tests {
-    use assert_matches::assert_matches;
-
     use super::*;
+    use assert_matches::assert_matches;
 
     fn parse_and_prepare_wat(wat: &str) -> Result<Vec<u8>, PrepareError> {
         let wasm = wat::parse_str(wat).unwrap();

runtime/near-vm-runner/src/prepare/prepare_v0.rs

@@ -4,7 +4,10 @@ use parity_wasm_41::builder;
 use parity_wasm_41::elements::{self, External, MemorySection, Type};
 use pwasm_utils_12 as pwasm_utils;
 
-pub fn prepare_contract(original_code: &[u8], config: &VMConfig) -> Result<Vec<u8>, PrepareError> {
+pub(crate) fn prepare_contract(
+    original_code: &[u8],
+    config: &VMConfig,
+) -> Result<Vec<u8>, PrepareError> {
     ContractModule::init(original_code, config)?
         .standardize_mem()
         .ensure_no_internal_memory()?

runtime/near-vm-runner/src/runner.rs

@@ -61,6 +61,7 @@ pub fn run(
         %method_name,
         ?vm_kind,
         burnt_gas = tracing::field::Empty,
+        %current_protocol_version,
     )
     .entered();