From e03eca36d79e511c85ba35672dab715ad065c51b Mon Sep 17 00:00:00 2001 From: GideonBature Date: Tue, 9 Jun 2026 03:44:26 +0100 Subject: [PATCH 1/3] Implements check balance to ensure caller have enough liquid balance to cover payable allocation --- src/executive/vm/program_execution/exec.rs | 24 ++++++++++++++--- .../vm/program_execution/exec_error.rs | 26 +++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/src/executive/vm/program_execution/exec.rs b/src/executive/vm/program_execution/exec.rs index e2e8caa4..2304eb70 100644 --- a/src/executive/vm/program_execution/exec.rs +++ b/src/executive/vm/program_execution/exec.rs @@ -187,10 +187,8 @@ pub async fn execute( return Err(ExecutionError::MinPayableAllocationError); } - // TODO: CHECK ENOUGH BALANCE. - // If a payable value is allocted, the caller must also be an account. - let _caller_key = match caller { + let caller_key = match caller { Caller::Account(key) => key, Caller::Contract(_) => { return Err(ExecutionError::PayableAllocationCallerIsNotAnAccountError); @@ -202,6 +200,26 @@ pub async fn execute( return Err(ExecutionError::PayableWithInternalCallError); } + // The caller must have enough liquid balance to cover the payable allocation. + let payable_allocation_in_satoshis = payable_allocation_value as u64; + let account_balance = { + let _coin_manager = coin_manager.lock().await; + _coin_manager + .get_account_balance(caller_key) + .ok_or(ExecutionError::PayableAllocationAccountNotFoundError( + caller_key, + ))? + }; + if account_balance < payable_allocation_in_satoshis { + return Err( + ExecutionError::InsufficientBalanceForPayableAllocationError { + account_key: caller_key, + required: payable_allocation_in_satoshis, + available: account_balance, + }, + ); + } + // Insert the allocation into the accountant. //if let Err(error) = accountant.insert_alloc(caller_key, payable_allocation_value) { // return Err(ExecutionError::AccountantAllocationInsertionError(error)); diff --git a/src/executive/vm/program_execution/exec_error.rs b/src/executive/vm/program_execution/exec_error.rs index 99925f53..67bc76b4 100644 --- a/src/executive/vm/program_execution/exec_error.rs +++ b/src/executive/vm/program_execution/exec_error.rs @@ -32,6 +32,14 @@ pub enum ExecutionError { PayableAllocationCallerIsNotAnAccountError, /// Payable with internal call error. PayableWithInternalCallError, + /// Payable allocation account not found in coin manager error. + PayableAllocationAccountNotFoundError([u8; 32]), + /// Insufficient balance for payable allocation error. + InsufficientBalanceForPayableAllocationError { + account_key: [u8; 32], + required: u64, + available: u64, + }, /// Invalid stack ending error. InvalidStackEndingError, /// Base ops price mismatch error. @@ -85,6 +93,24 @@ impl fmt::Display for ExecutionError { ExecutionError::PayableWithInternalCallError => { write!(f, "Payable with internal call") } + ExecutionError::PayableAllocationAccountNotFoundError(account_key) => { + write!( + f, + "Payable allocation account not found in coin manager: {:?}", + account_key + ) + } + ExecutionError::InsufficientBalanceForPayableAllocationError { + account_key, + required, + available, + } => { + write!( + f, + "Insufficient balance for payable allocation: account {:?}, required {}, available {}", + account_key, required, available + ) + } ExecutionError::InvalidStackEndingError => { write!(f, "Invalid stack ending") } From b7ac51220646e22f611e9f7ddacf7cb69c54563a Mon Sep 17 00:00:00 2001 From: GideonBature Date: Tue, 9 Jun 2026 03:51:43 +0100 Subject: [PATCH 2/3] Fix cargo fmt --- .../opcodes/altstack/op_fromaltstack.rs | 8 +- .../opcodes/opcodes/altstack/op_toaltstack.rs | 8 +- .../opcodes/arithmetic/op_0notequal.rs | 8 +- .../vm/opcodes/opcodes/arithmetic/op_1add.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_1sub.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_2div.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_2mul.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_add.rs | 12 ++- .../opcodes/opcodes/arithmetic/op_addmod.rs | 12 ++- .../opcodes/opcodes/arithmetic/op_booland.rs | 8 +- .../opcodes/opcodes/arithmetic/op_boolor.rs | 4 +- .../vm/opcodes/opcodes/arithmetic/op_div.rs | 12 ++- .../opcodes/arithmetic/op_greaterthan.rs | 16 ++-- .../arithmetic/op_greaterthanorequal.rs | 16 ++-- .../opcodes/opcodes/arithmetic/op_lessthan.rs | 16 ++-- .../opcodes/arithmetic/op_lessthanorequal.rs | 16 ++-- .../opcodes/opcodes/arithmetic/op_lshift.rs | 4 +- .../vm/opcodes/opcodes/arithmetic/op_max.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_min.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_mul.rs | 12 ++- .../opcodes/opcodes/arithmetic/op_mulmod.rs | 12 ++- .../vm/opcodes/opcodes/arithmetic/op_not.rs | 4 +- .../opcodes/opcodes/arithmetic/op_numequal.rs | 16 ++-- .../opcodes/arithmetic/op_numequalverify.rs | 14 ++-- .../opcodes/arithmetic/op_numnotequal.rs | 16 ++-- .../opcodes/opcodes/arithmetic/op_rshift.rs | 4 +- .../vm/opcodes/opcodes/arithmetic/op_sub.rs | 12 ++- .../opcodes/opcodes/arithmetic/op_within.rs | 12 ++- .../vm/opcodes/opcodes/bitwise/op_and.rs | 4 +- .../vm/opcodes/opcodes/bitwise/op_equal.rs | 4 +- .../opcodes/opcodes/bitwise/op_equalverify.rs | 12 +-- .../vm/opcodes/opcodes/bitwise/op_invert.rs | 4 +- .../vm/opcodes/opcodes/bitwise/op_or.rs | 4 +- .../vm/opcodes/opcodes/bitwise/op_reverse.rs | 8 +- .../vm/opcodes/opcodes/bitwise/op_xor.rs | 4 +- .../vm/opcodes/opcodes/call/op_callext.rs | 4 +- .../opcodes/opcodes/callinfo/op_opsbudget.rs | 4 +- .../opcodes/opcodes/callinfo/op_opscounter.rs | 4 +- .../opcodes/opcodes/callinfo/op_opsprice.rs | 4 +- .../opcodes/opcodes/callinfo/op_timestamp.rs | 4 +- .../vm/opcodes/opcodes/coin/op_ext_balance.rs | 6 +- .../opcodes/opcodes/coin/op_self_balance.rs | 6 +- .../vm/opcodes/opcodes/coin/op_transfer.rs | 6 +- .../opcodes/opcodes/digest/op_blake2bvar.rs | 2 +- .../opcodes/opcodes/digest/op_blake2svar.rs | 2 +- .../vm/opcodes/opcodes/digest/op_hash160.rs | 4 +- .../vm/opcodes/opcodes/digest/op_hash256.rs | 4 +- .../vm/opcodes/opcodes/digest/op_ripemd160.rs | 4 +- .../opcodes/opcodes/digest/op_taggedhash.rs | 2 +- .../vm/opcodes/opcodes/flow/op_else.rs | 10 +-- .../vm/opcodes/opcodes/flow/op_endif.rs | 4 +- .../vm/opcodes/opcodes/flow/op_fail.rs | 4 +- .../vm/opcodes/opcodes/flow/op_if.rs | 10 +-- .../vm/opcodes/opcodes/flow/op_nop.rs | 4 +- .../vm/opcodes/opcodes/flow/op_notif.rs | 10 +-- .../vm/opcodes/opcodes/flow/op_returnall.rs | 8 +- .../vm/opcodes/opcodes/flow/op_returnsome.rs | 16 ++-- .../vm/opcodes/opcodes/flow/op_verify.rs | 8 +- .../opcodes/governance/op_gov_account.rs | 6 +- .../opcodes/governance/op_gov_contract.rs | 4 +- .../opcodes/governance/op_reconstitute.rs | 4 +- .../opcodes/governance/op_update_param.rs | 4 +- .../vm/opcodes/opcodes/push/op_10.rs | 4 +- .../vm/opcodes/opcodes/push/op_11.rs | 4 +- .../vm/opcodes/opcodes/push/op_12.rs | 4 +- .../vm/opcodes/opcodes/push/op_13.rs | 4 +- .../vm/opcodes/opcodes/push/op_14.rs | 4 +- .../vm/opcodes/opcodes/push/op_15.rs | 4 +- .../vm/opcodes/opcodes/push/op_16.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_2.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_3.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_4.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_5.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_6.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_7.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_8.rs | 4 +- src/executive/vm/opcodes/opcodes/push/op_9.rs | 4 +- .../vm/opcodes/opcodes/push/op_false.rs | 4 +- .../vm/opcodes/opcodes/push/op_pushdata.rs | 2 +- .../vm/opcodes/opcodes/push/op_true.rs | 4 +- .../opcodes/secp/op_isinfinitesecppoint.rs | 4 +- .../opcodes/secp/op_iszerosecpscalar.rs | 4 +- .../opcodes/secp/op_pushsecpgeneratorpoint.rs | 4 +- .../opcodes/opcodes/secp/op_secppointadd.rs | 4 +- .../opcodes/opcodes/secp/op_secppointmul.rs | 4 +- .../opcodes/opcodes/secp/op_secpscalaradd.rs | 4 +- .../opcodes/opcodes/secp/op_secpscalarmul.rs | 4 +- .../opcodes/shadowing/op_shadow_alloc.rs | 6 +- .../opcodes/shadowing/op_shadow_alloc_val.rs | 6 +- .../opcodes/shadowing/op_shadow_allocs_sum.rs | 6 +- .../opcodes/shadowing/op_shadow_dealloc.rs | 6 +- .../opcodes/shadowing/op_shadow_down.rs | 6 +- .../opcodes/shadowing/op_shadow_down_all.rs | 6 +- .../opcodes/shadowing/op_shadow_has_alloc.rs | 6 +- .../opcodes/shadowing/op_shadow_num_allocs.rs | 6 +- .../opcodes/opcodes/shadowing/op_shadow_up.rs | 6 +- .../opcodes/shadowing/op_shadow_up_all.rs | 6 +- .../opcodes/signature/op_checkblssig.rs | 4 +- .../opcodes/signature/op_checkblssigagg.rs | 2 +- .../opcodes/signature/op_checkschnorrsig.rs | 4 +- .../signature/op_checkschnorrsigbip340.rs | 4 +- .../vm/opcodes/opcodes/splice/op_cat.rs | 4 +- .../vm/opcodes/opcodes/splice/op_left.rs | 12 ++- .../vm/opcodes/opcodes/splice/op_right.rs | 12 ++- .../vm/opcodes/opcodes/splice/op_size.rs | 12 ++- .../vm/opcodes/opcodes/splice/op_split.rs | 12 ++- .../vm/opcodes/opcodes/stack/op_2drop.rs | 4 +- .../vm/opcodes/opcodes/stack/op_2dup.rs | 4 +- .../vm/opcodes/opcodes/stack/op_2over.rs | 4 +- .../vm/opcodes/opcodes/stack/op_2rot.rs | 4 +- .../vm/opcodes/opcodes/stack/op_2swap.rs | 4 +- .../vm/opcodes/opcodes/stack/op_3dup.rs | 4 +- .../vm/opcodes/opcodes/stack/op_depth.rs | 12 ++- .../vm/opcodes/opcodes/stack/op_drop.rs | 4 +- .../vm/opcodes/opcodes/stack/op_dup.rs | 4 +- .../vm/opcodes/opcodes/stack/op_ifdup.rs | 4 +- .../vm/opcodes/opcodes/stack/op_nip.rs | 4 +- .../vm/opcodes/opcodes/stack/op_over.rs | 4 +- .../vm/opcodes/opcodes/stack/op_pick.rs | 10 +-- .../vm/opcodes/opcodes/stack/op_roll.rs | 10 +-- .../vm/opcodes/opcodes/stack/op_rot.rs | 4 +- .../vm/opcodes/opcodes/stack/op_swap.rs | 4 +- .../vm/opcodes/opcodes/stack/op_tuck.rs | 4 +- .../vm/opcodes/opcodes/storage/op_sfree.rs | 2 +- .../vm/opcodes/opcodes/storage/op_sread.rs | 2 +- .../vm/opcodes/opcodes/storage/op_swrite.rs | 2 +- src/executive/vm/program_execution/exec.rs | 12 ++- src/executive/vm/stack/stack_error.rs | 3 +- .../params_holder/opcode_ops_params.rs | 1 - src/inscriptive/params_manager/params_keys.rs | 13 ++-- .../params_manager/params_manager.rs | 78 ++++++++++++------- 131 files changed, 474 insertions(+), 453 deletions(-) diff --git a/src/executive/vm/opcodes/opcodes/altstack/op_fromaltstack.rs b/src/executive/vm/opcodes/opcodes/altstack/op_fromaltstack.rs index c59be36d..67184a78 100644 --- a/src/executive/vm/opcodes/opcodes/altstack/op_fromaltstack.rs +++ b/src/executive/vm/opcodes/opcodes/altstack/op_fromaltstack.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -20,7 +18,9 @@ impl OP_FROMALTSTACK { let last_item = stack_holder.alt_stack_pop()?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_fromaltstack))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_fromaltstack, + ))?; // Push the last item to the main stack. stack_holder.push(last_item)?; diff --git a/src/executive/vm/opcodes/opcodes/altstack/op_toaltstack.rs b/src/executive/vm/opcodes/opcodes/altstack/op_toaltstack.rs index 4167505a..1e8c7d3e 100644 --- a/src/executive/vm/opcodes/opcodes/altstack/op_toaltstack.rs +++ b/src/executive/vm/opcodes/opcodes/altstack/op_toaltstack.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -20,7 +18,9 @@ impl OP_TOALTSTACK { let last_item = stack_holder.pop()?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_toaltstack))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_toaltstack, + ))?; // Push the last item to the alt stack. stack_holder.alt_stack_push(last_item)?; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_0notequal.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_0notequal.rs index 08ebbc99..e881c6cb 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_0notequal.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_0notequal.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -26,7 +26,9 @@ impl OP_0NOTEQUAL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_0notequal))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_0notequal, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_1add.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_1add.rs index bae00dbc..528bdb64 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_1add.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_1add.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_1sub.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_1sub.rs index 86e50f6c..1eb2d0cd 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_1sub.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_1sub.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_2div.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_2div.rs index 9aca0edd..5400b6c1 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_2div.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_2div.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_2mul.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_2mul.rs index 47fe49ac..3719c8a7 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_2mul.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_2mul.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_add.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_add.rs index c9265ef1..db10587a 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_add.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_add.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_addmod.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_addmod.rs index c58daaa9..489843e2 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_addmod.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_addmod.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_booland.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_booland.rs index 92e445af..01f5a3d3 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_booland.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_booland.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -30,7 +30,9 @@ impl OP_BOOLAND { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_booland))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_booland, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_boolor.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_boolor.rs index 61fddd5b..6988348a 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_boolor.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_boolor.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_div.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_div.rs index 7492345c..65c9bdee 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_div.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_div.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthan.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthan.rs index f2733f9d..0be9f710 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthan.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthan.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_GREATERTHAN { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_greaterthan))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_greaterthan, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthanorequal.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthanorequal.rs index f4aae228..beacf0a6 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthanorequal.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_greaterthanorequal.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_GREATERTHANOREQUAL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_greaterthanorequal))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_greaterthanorequal, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthan.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthan.rs index 9c038704..d5b21a0f 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthan.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthan.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_LESSTHAN { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_lessthan))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_lessthan, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthanorequal.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthanorequal.rs index 633267bd..beb1e493 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthanorequal.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_lessthanorequal.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_LESSTHANOREQUAL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_lessthanorequal))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_lessthanorequal, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_lshift.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_lshift.rs index 68f1bb52..d93ed462 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_lshift.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_lshift.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_max.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_max.rs index 9501ef41..b09e474e 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_max.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_max.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_min.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_min.rs index 06b48afb..12dc5b2b 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_min.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_min.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_mul.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_mul.rs index 704be164..4109d374 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_mul.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_mul.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_mulmod.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_mulmod.rs index aef99f15..b71ac3dc 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_mulmod.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_mulmod.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_not.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_not.rs index fffd699a..4bcd9923 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_not.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_not.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_numequal.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_numequal.rs index 9e3feaab..4a5d1603 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_numequal.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_numequal.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -45,7 +43,9 @@ impl OP_NUMEQUAL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_numequal))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_numequal, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_numequalverify.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_numequalverify.rs index cf24ff78..2c614699 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_numequalverify.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_numequalverify.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - stack_error::{MandatoryError, StackError, StackUintError}, - stack_holder::StackHolder, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{MandatoryError, StackError, StackUintError}, + stack_holder::StackHolder, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_NUMEQUALVERIFY { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_numequalverify))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_numequalverify, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_numnotequal.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_numnotequal.rs index bc6982b0..49101fdb 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_numnotequal.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_numnotequal.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -44,7 +42,9 @@ impl OP_NUMNOTEQUAL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_numnotequal))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_numnotequal, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_rshift.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_rshift.rs index 67790fd7..1b05d6e6 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_rshift.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_rshift.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_sub.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_sub.rs index 79414166..6852f7c3 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_sub.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_sub.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/arithmetic/op_within.rs b/src/executive/vm/opcodes/opcodes/arithmetic/op_within.rs index ac06ea80..0242c0f7 100644 --- a/src/executive/vm/opcodes/opcodes/arithmetic/op_within.rs +++ b/src/executive/vm/opcodes/opcodes/arithmetic/op_within.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_and.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_and.rs index 248fda4d..948ed8d3 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_and.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_and.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_equal.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_equal.rs index 6c262fc6..b3a1189d 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_equal.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_equal.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_equalverify.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_equalverify.rs index bac42b65..857af0bd 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_equalverify.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_equalverify.rs @@ -1,8 +1,6 @@ -use crate::executive::{ - stack::{ - stack_error::{MandatoryError, StackError}, - stack_holder::StackHolder, - }, +use crate::executive::stack::{ + stack_error::{MandatoryError, StackError}, + stack_holder::StackHolder, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -31,7 +29,9 @@ impl OP_EQUALVERIFY { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_equalverify))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_equalverify, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_invert.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_invert.rs index 25e1221d..a92239c7 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_invert.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_invert.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_or.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_or.rs index d7145792..3d59a3b8 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_or.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_or.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_reverse.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_reverse.rs index 6d0fd54e..bc35e58f 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_reverse.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_reverse.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -29,7 +29,9 @@ impl OP_REVERSE { stack_holder.push(StackItem::new(reversed_bytes))?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_reverse))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_reverse, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/bitwise/op_xor.rs b/src/executive/vm/opcodes/opcodes/bitwise/op_xor.rs index 4302ac5e..0222c544 100644 --- a/src/executive/vm/opcodes/opcodes/bitwise/op_xor.rs +++ b/src/executive/vm/opcodes/opcodes/bitwise/op_xor.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/call/op_callext.rs b/src/executive/vm/opcodes/opcodes/call/op_callext.rs index c182282c..feb76dda 100644 --- a/src/executive/vm/opcodes/opcodes/call/op_callext.rs +++ b/src/executive/vm/opcodes/opcodes/call/op_callext.rs @@ -81,7 +81,9 @@ impl OP_CALLEXT { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_callext))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_callext, + ))?; Ok((contract_id_bytes, method_index_as_u16, arguments)) } diff --git a/src/executive/vm/opcodes/opcodes/callinfo/op_opsbudget.rs b/src/executive/vm/opcodes/opcodes/callinfo/op_opsbudget.rs index 283f4ec3..eda397f5 100644 --- a/src/executive/vm/opcodes/opcodes/callinfo/op_opsbudget.rs +++ b/src/executive/vm/opcodes/opcodes/callinfo/op_opsbudget.rs @@ -33,7 +33,9 @@ impl OP_OPSBUDGET { stack_holder.push(ops_budget_as_stack_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_opsbudget))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_opsbudget, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/callinfo/op_opscounter.rs b/src/executive/vm/opcodes/opcodes/callinfo/op_opscounter.rs index 858ddc0c..3d2c41c8 100644 --- a/src/executive/vm/opcodes/opcodes/callinfo/op_opscounter.rs +++ b/src/executive/vm/opcodes/opcodes/callinfo/op_opscounter.rs @@ -33,7 +33,9 @@ impl OP_OPSCOUNTER { stack_holder.push(ops_counter_as_stack_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_opscounter))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_opscounter, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/callinfo/op_opsprice.rs b/src/executive/vm/opcodes/opcodes/callinfo/op_opsprice.rs index b40e5cad..512f40fb 100644 --- a/src/executive/vm/opcodes/opcodes/callinfo/op_opsprice.rs +++ b/src/executive/vm/opcodes/opcodes/callinfo/op_opsprice.rs @@ -33,7 +33,9 @@ impl OP_OPSPRICE { stack_holder.push(ops_price_as_stack_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_opsprice))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_opsprice, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/callinfo/op_timestamp.rs b/src/executive/vm/opcodes/opcodes/callinfo/op_timestamp.rs index 4569d049..a5f7d70a 100644 --- a/src/executive/vm/opcodes/opcodes/callinfo/op_timestamp.rs +++ b/src/executive/vm/opcodes/opcodes/callinfo/op_timestamp.rs @@ -33,7 +33,9 @@ impl OP_TIMESTAMP { stack_holder.push(timestamp_as_stack_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_timestamp))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_timestamp, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/coin/op_ext_balance.rs b/src/executive/vm/opcodes/opcodes/coin/op_ext_balance.rs index 95a77a23..06e70e3e 100644 --- a/src/executive/vm/opcodes/opcodes/coin/op_ext_balance.rs +++ b/src/executive/vm/opcodes/opcodes/coin/op_ext_balance.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ stack_error::{CoinBalanceGetError, StackError}, @@ -7,7 +8,6 @@ use crate::{ }, inscriptive::coin_manager::coin_manager::COIN_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Pushes the account's individual BTC balance into the stack. @@ -105,7 +105,9 @@ impl OP_EXT_BALANCE { } } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_ext_balance))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_ext_balance, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/coin/op_self_balance.rs b/src/executive/vm/opcodes/opcodes/coin/op_self_balance.rs index 34976bd1..41fc932e 100644 --- a/src/executive/vm/opcodes/opcodes/coin/op_self_balance.rs +++ b/src/executive/vm/opcodes/opcodes/coin/op_self_balance.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ stack_error::{CoinBalanceGetError, StackError}, @@ -7,7 +8,6 @@ use crate::{ }, inscriptive::coin_manager::coin_manager::COIN_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Pushes the BTC balance of the underlying contract into the stack. @@ -48,7 +48,9 @@ impl OP_SELF_BALANCE { // Push the contract balance to the stack. stack_holder.push(contract_balance_as_stack_item)?; - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_self_balance))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_self_balance, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/coin/op_transfer.rs b/src/executive/vm/opcodes/opcodes/coin/op_transfer.rs index 8cadda75..227105c4 100644 --- a/src/executive/vm/opcodes/opcodes/coin/op_transfer.rs +++ b/src/executive/vm/opcodes/opcodes/coin/op_transfer.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ stack_error::{CoinTransferError, StackError}, @@ -6,7 +7,6 @@ use crate::{ }, inscriptive::coin_manager::coin_manager::COIN_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Transfers coins from the contract into an account or to another contract. @@ -152,7 +152,9 @@ impl OP_TRANSFER { } } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_transfer))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_transfer, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/digest/op_blake2bvar.rs b/src/executive/vm/opcodes/opcodes/digest/op_blake2bvar.rs index 2b1f981f..87e8764a 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_blake2bvar.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_blake2bvar.rs @@ -1,10 +1,10 @@ use crate::executive::stack::stack_uint::StackItemUintExt; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::executive::stack::{ stack_error::{StackError, StackUintError}, stack_holder::StackHolder, stack_item::StackItem, }; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use blake2::digest::{Update, VariableOutput}; use blake2::Blake2bVar; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/digest/op_blake2svar.rs b/src/executive/vm/opcodes/opcodes/digest/op_blake2svar.rs index 7580e714..f6d17109 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_blake2svar.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_blake2svar.rs @@ -1,10 +1,10 @@ use crate::executive::stack::stack_uint::StackItemUintExt; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::executive::stack::{ stack_error::{StackError, StackUintError}, stack_holder::StackHolder, stack_item::StackItem, }; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use blake2::digest::{Update, VariableOutput}; use blake2::Blake2sVar; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/digest/op_hash160.rs b/src/executive/vm/opcodes/opcodes/digest/op_hash160.rs index c3c33e89..4db6f6aa 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_hash160.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_hash160.rs @@ -32,7 +32,9 @@ impl OP_HASH160 { let ripemd160_hash = ripemd160::Hash::hash(&sha256_hash).to_byte_array().to_vec(); // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_hash160))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_hash160, + ))?; // Push the hash back to the main stack. stack_holder.push(StackItem::new(ripemd160_hash))?; diff --git a/src/executive/vm/opcodes/opcodes/digest/op_hash256.rs b/src/executive/vm/opcodes/opcodes/digest/op_hash256.rs index 590e1eef..0404a4ae 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_hash256.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_hash256.rs @@ -31,7 +31,9 @@ impl OP_HASH256 { let second_hash = sha256::Hash::hash(&first_hash).to_byte_array().to_vec(); // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_hash256))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_hash256, + ))?; // Push the hash back to the main stack. stack_holder.push(StackItem::new(second_hash))?; diff --git a/src/executive/vm/opcodes/opcodes/digest/op_ripemd160.rs b/src/executive/vm/opcodes/opcodes/digest/op_ripemd160.rs index 3be6e79e..8cfd5907 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_ripemd160.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_ripemd160.rs @@ -28,7 +28,9 @@ impl OP_RIPEMD160 { .to_vec(); // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_ripemd160))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_ripemd160, + ))?; // Push the hash back to the main stack. stack_holder.push(StackItem::new(hash))?; diff --git a/src/executive/vm/opcodes/opcodes/digest/op_taggedhash.rs b/src/executive/vm/opcodes/opcodes/digest/op_taggedhash.rs index 694d6811..4da59fbe 100644 --- a/src/executive/vm/opcodes/opcodes/digest/op_taggedhash.rs +++ b/src/executive/vm/opcodes/opcodes/digest/op_taggedhash.rs @@ -1,8 +1,8 @@ use crate::executive::stack::{ stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; -use crate::transmutative::hash::{Hash, HashTag}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; +use crate::transmutative::hash::{Hash, HashTag}; use serde::{Deserialize, Serialize}; /// The input is hashed with a domain separation tag. diff --git a/src/executive/vm/opcodes/opcodes/flow/op_else.rs b/src/executive/vm/opcodes/opcodes/flow/op_else.rs index d78c9ed9..da3a9784 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_else.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_else.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, - stack_error::StackError, - stack_holder::StackHolder, - }, +use crate::executive::stack::{ + flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, + stack_error::StackError, + stack_holder::StackHolder, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_endif.rs b/src/executive/vm/opcodes/opcodes/flow/op_endif.rs index 92ec4f4d..268a392e 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_endif.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_endif.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_fail.rs b/src/executive/vm/opcodes/opcodes/flow/op_fail.rs index 6eea6435..dd00e83f 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_fail.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_fail.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_if.rs b/src/executive/vm/opcodes/opcodes/flow/op_if.rs index c4ead769..a0fcb1e0 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_if.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_if.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, - stack_error::StackError, - stack_holder::StackHolder, - }, +use crate::executive::stack::{ + flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, + stack_error::StackError, + stack_holder::StackHolder, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_nop.rs b/src/executive/vm/opcodes/opcodes/flow/op_nop.rs index e200c94a..680abbe9 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_nop.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_nop.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_notif.rs b/src/executive/vm/opcodes/opcodes/flow/op_notif.rs index e96c8375..6e11da77 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_notif.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_notif.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, - stack_error::StackError, - stack_holder::StackHolder, - }, +use crate::executive::stack::{ + flow::{flow_encounter::FlowEncounter, flow_status::FlowStatus}, + stack_error::StackError, + stack_holder::StackHolder, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/flow/op_returnall.rs b/src/executive/vm/opcodes/opcodes/flow/op_returnall.rs index 99b45d92..49ac38bd 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_returnall.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_returnall.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -28,7 +28,9 @@ impl OP_RETURNALL { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_returnall))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_returnall, + ))?; Ok(items) } diff --git a/src/executive/vm/opcodes/opcodes/flow/op_returnsome.rs b/src/executive/vm/opcodes/opcodes/flow/op_returnsome.rs index 73196e28..93dcb264 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_returnsome.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_returnsome.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; @@ -42,7 +40,9 @@ impl OP_RETURNSOME { } // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_returnsome))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_returnsome, + ))?; Ok(items) } diff --git a/src/executive/vm/opcodes/opcodes/flow/op_verify.rs b/src/executive/vm/opcodes/opcodes/flow/op_verify.rs index e7c54689..0a81e2c1 100644 --- a/src/executive/vm/opcodes/opcodes/flow/op_verify.rs +++ b/src/executive/vm/opcodes/opcodes/flow/op_verify.rs @@ -1,8 +1,6 @@ -use crate::executive::{ - stack::{ - stack_error::{MandatoryError, StackError}, - stack_holder::StackHolder, - }, +use crate::executive::stack::{ + stack_error::{MandatoryError, StackError}, + stack_holder::StackHolder, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/governance/op_gov_account.rs b/src/executive/vm/opcodes/opcodes/governance/op_gov_account.rs index a3e54495..81e1b01e 100644 --- a/src/executive/vm/opcodes/opcodes/governance/op_gov_account.rs +++ b/src/executive/vm/opcodes/opcodes/governance/op_gov_account.rs @@ -43,7 +43,7 @@ impl OP_GOV_ACCOUNT { 1 => {} // Expel pleb init 2 => {} - // Expel pleb undo + // Expel pleb undo 3 => {} // Turn account resident 4 => {} @@ -62,7 +62,9 @@ impl OP_GOV_ACCOUNT { } } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_gov_account))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_gov_account, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/governance/op_gov_contract.rs b/src/executive/vm/opcodes/opcodes/governance/op_gov_contract.rs index 73ee3c1b..9dc6dadd 100644 --- a/src/executive/vm/opcodes/opcodes/governance/op_gov_contract.rs +++ b/src/executive/vm/opcodes/opcodes/governance/op_gov_contract.rs @@ -14,7 +14,9 @@ impl OP_GOV_CONTRACT { return Ok(()); } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_gov_contract))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_gov_contract, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/governance/op_reconstitute.rs b/src/executive/vm/opcodes/opcodes/governance/op_reconstitute.rs index d30009d0..6fdaf8ae 100644 --- a/src/executive/vm/opcodes/opcodes/governance/op_reconstitute.rs +++ b/src/executive/vm/opcodes/opcodes/governance/op_reconstitute.rs @@ -14,7 +14,9 @@ impl OP_RECONSTITUTE { return Ok(()); } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_reconstitute))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_reconstitute, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/governance/op_update_param.rs b/src/executive/vm/opcodes/opcodes/governance/op_update_param.rs index 2703c508..0fc263cc 100644 --- a/src/executive/vm/opcodes/opcodes/governance/op_update_param.rs +++ b/src/executive/vm/opcodes/opcodes/governance/op_update_param.rs @@ -14,7 +14,9 @@ impl OP_UPDATE_PARAM { return Ok(()); } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_update_param))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_update_param, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/push/op_10.rs b/src/executive/vm/opcodes/opcodes/push/op_10.rs index d5c893fe..da0b4b9e 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_10.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_10.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_11.rs b/src/executive/vm/opcodes/opcodes/push/op_11.rs index b7b4c81c..be54bf5c 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_11.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_11.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_12.rs b/src/executive/vm/opcodes/opcodes/push/op_12.rs index 8c240af3..8998d90f 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_12.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_12.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_13.rs b/src/executive/vm/opcodes/opcodes/push/op_13.rs index 2f30a39f..bc6f926d 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_13.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_13.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_14.rs b/src/executive/vm/opcodes/opcodes/push/op_14.rs index 1ee38ea8..e90b6bd9 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_14.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_14.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_15.rs b/src/executive/vm/opcodes/opcodes/push/op_15.rs index 7cea1a60..c1cc6c49 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_15.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_15.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_16.rs b/src/executive/vm/opcodes/opcodes/push/op_16.rs index 4f87ad0b..42c5651a 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_16.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_16.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_2.rs b/src/executive/vm/opcodes/opcodes/push/op_2.rs index d9d6677b..5af80191 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_2.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_2.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_3.rs b/src/executive/vm/opcodes/opcodes/push/op_3.rs index 0b1307b9..9d1b413a 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_3.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_3.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_4.rs b/src/executive/vm/opcodes/opcodes/push/op_4.rs index da732eb8..2e37c9ba 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_4.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_4.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_5.rs b/src/executive/vm/opcodes/opcodes/push/op_5.rs index cecfdc6f..1afe7b6e 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_5.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_5.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_6.rs b/src/executive/vm/opcodes/opcodes/push/op_6.rs index ac396ff1..28a16f93 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_6.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_6.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_7.rs b/src/executive/vm/opcodes/opcodes/push/op_7.rs index 1fe04952..9818afc2 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_7.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_7.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_8.rs b/src/executive/vm/opcodes/opcodes/push/op_8.rs index 4a773a7e..80b9d562 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_8.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_8.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_9.rs b/src/executive/vm/opcodes/opcodes/push/op_9.rs index ccadfffc..5fb75f8b 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_9.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_9.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_false.rs b/src/executive/vm/opcodes/opcodes/push/op_false.rs index 574877de..3dd8df6a 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_false.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_false.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/push/op_pushdata.rs b/src/executive/vm/opcodes/opcodes/push/op_pushdata.rs index d14019dd..9f877f89 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_pushdata.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_pushdata.rs @@ -1,4 +1,3 @@ -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use super::op_10::OP_10; use super::op_11::OP_11; use super::op_12::OP_12; @@ -20,6 +19,7 @@ use crate::executive::stack::{ limits::MAX_STACK_ITEM_SIZE, stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Pushes data to the main stack. diff --git a/src/executive/vm/opcodes/opcodes/push/op_true.rs b/src/executive/vm/opcodes/opcodes/push/op_true.rs index 9524b0d5..e58beaf3 100644 --- a/src/executive/vm/opcodes/opcodes/push/op_true.rs +++ b/src/executive/vm/opcodes/opcodes/push/op_true.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/secp/op_isinfinitesecppoint.rs b/src/executive/vm/opcodes/opcodes/secp/op_isinfinitesecppoint.rs index 55b54107..b43e8b2f 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_isinfinitesecppoint.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_isinfinitesecppoint.rs @@ -39,7 +39,9 @@ impl OP_ISINFINITESECPPOINT { stack_holder.push(result_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_isinfinitesecppoint))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_isinfinitesecppoint, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_iszerosecpscalar.rs b/src/executive/vm/opcodes/opcodes/secp/op_iszerosecpscalar.rs index 8ff7619e..c83c5429 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_iszerosecpscalar.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_iszerosecpscalar.rs @@ -42,7 +42,9 @@ impl OP_ISZEROSECPSCALAR { stack_holder.push(result_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_iszerosecpscalar))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_iszerosecpscalar, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_pushsecpgeneratorpoint.rs b/src/executive/vm/opcodes/opcodes/secp/op_pushsecpgeneratorpoint.rs index f5c02a36..95005aff 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_pushsecpgeneratorpoint.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_pushsecpgeneratorpoint.rs @@ -29,7 +29,9 @@ impl OP_PUSHSECPGENERATORPOINT { stack_holder.push(generator_point_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_pushsecpgeneratorpoint))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_pushsecpgeneratorpoint, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_secppointadd.rs b/src/executive/vm/opcodes/opcodes/secp/op_secppointadd.rs index ee1aa579..ead9aa20 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_secppointadd.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_secppointadd.rs @@ -48,7 +48,9 @@ impl OP_SECPPOINTADD { stack_holder.push(addition_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_secppointadd))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_secppointadd, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_secppointmul.rs b/src/executive/vm/opcodes/opcodes/secp/op_secppointmul.rs index a4297d0c..ea28b91e 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_secppointmul.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_secppointmul.rs @@ -52,7 +52,9 @@ impl OP_SECPPOINTMUL { stack_holder.push(multiplication_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_secppointmul))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_secppointmul, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_secpscalaradd.rs b/src/executive/vm/opcodes/opcodes/secp/op_secpscalaradd.rs index 63439ad3..6e040895 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_secpscalaradd.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_secpscalaradd.rs @@ -57,7 +57,9 @@ impl OP_SECPSCALARADD { stack_holder.push(addition_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_secpscalaradd))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_secpscalaradd, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/secp/op_secpscalarmul.rs b/src/executive/vm/opcodes/opcodes/secp/op_secpscalarmul.rs index 0a0246b0..7db2fc41 100644 --- a/src/executive/vm/opcodes/opcodes/secp/op_secpscalarmul.rs +++ b/src/executive/vm/opcodes/opcodes/secp/op_secpscalarmul.rs @@ -57,7 +57,9 @@ impl OP_SECPSCALARMUL { stack_holder.push(multiplication_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_secpscalarmul))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_secpscalarmul, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc.rs index 45055f78..481f1514 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc.rs @@ -2,8 +2,8 @@ use crate::executive::stack::{ stack_error::{ShadowOpsError, StackError}, stack_holder::StackHolder, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Allocates within the contract shadow space an account. @@ -47,7 +47,9 @@ impl OP_SHADOW_ALLOC { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_alloc))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_alloc, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc_val.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc_val.rs index 593ae632..be12e206 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc_val.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_alloc_val.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ stack_error::{ShadowOpsError, StackError}, @@ -7,7 +8,6 @@ use crate::{ }, inscriptive::coin_manager::coin_manager::COIN_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Returns the allocation value of an account within the contract shadow space. @@ -73,7 +73,9 @@ impl OP_SHADOW_ALLOC_VAL { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_alloc_val))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_alloc_val, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_allocs_sum.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_allocs_sum.rs index 792960bc..7dbb20fc 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_allocs_sum.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_allocs_sum.rs @@ -4,8 +4,8 @@ use crate::executive::stack::{ stack_item::StackItem, stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Returns the sum of all shadow allocation values of the contract. @@ -51,7 +51,9 @@ impl OP_SHADOW_ALLOCS_SUM { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_allocs_sum))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_allocs_sum, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_dealloc.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_dealloc.rs index 91a62519..7e12da11 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_dealloc.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_dealloc.rs @@ -2,8 +2,8 @@ use crate::executive::stack::{ stack_error::{ShadowOpsError, StackError}, stack_holder::StackHolder, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Deallocates within the contract shadow space an account. @@ -47,7 +47,9 @@ impl OP_SHADOW_DEALLOC { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_dealloc))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_dealloc, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down.rs index b6b6bc6a..964310bb 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_holder::StackHolder, stack_uint::{SafeConverter, StackItemUintExt}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Decreases the shadow space allocation of an account. @@ -63,7 +63,9 @@ impl OP_SHADOW_DOWN { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_down))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_down, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down_all.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down_all.rs index a5e3797d..4d60199a 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down_all.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_down_all.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_holder::StackHolder, stack_uint::{SafeConverter, StackItemUintExt}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Shadow allocation down all. @@ -48,7 +48,9 @@ impl OP_SHADOW_DOWN_ALL { .map_err(ShadowOpsError::ShadowAllocDownAllError) .map_err(StackError::ShadowOpsError)?; } - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_down_all))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_down_all, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_has_alloc.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_has_alloc.rs index 11542453..fef36209 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_has_alloc.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_has_alloc.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_holder::StackHolder, stack_item::StackItem, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Checks if an account has an allocation within the contract shadow space. @@ -56,7 +56,9 @@ impl OP_SHADOW_HAS_ALLOC { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_has_alloc))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_has_alloc, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_num_allocs.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_num_allocs.rs index d4f55057..3ad62b74 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_num_allocs.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_num_allocs.rs @@ -4,8 +4,8 @@ use crate::executive::stack::{ stack_item::StackItem, stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Returns the number of total shadow allocations of the contract. @@ -50,7 +50,9 @@ impl OP_SHADOW_NUM_ALLOCS { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_num_allocs))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_num_allocs, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up.rs index 397294db..8b51a3e7 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_holder::StackHolder, stack_uint::{SafeConverter, StackItemUintExt}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Increases the shadow space allocation of an account. @@ -63,7 +63,9 @@ impl OP_SHADOW_UP { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_up))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_up, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up_all.rs b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up_all.rs index f5756ca1..32b4eed4 100644 --- a/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up_all.rs +++ b/src/executive/vm/opcodes/opcodes/shadowing/op_shadow_up_all.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_holder::StackHolder, stack_uint::{SafeConverter, StackItemUintExt}, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::inscriptive::coin_manager::coin_manager::COIN_MANAGER; +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] @@ -49,7 +49,9 @@ impl OP_SHADOW_UP_ALL { } // Return the result. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_shadow_up_all))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_shadow_up_all, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/signature/op_checkblssig.rs b/src/executive/vm/opcodes/opcodes/signature/op_checkblssig.rs index 1d88568a..460befe0 100644 --- a/src/executive/vm/opcodes/opcodes/signature/op_checkblssig.rs +++ b/src/executive/vm/opcodes/opcodes/signature/op_checkblssig.rs @@ -60,7 +60,9 @@ impl OP_CHECKBLSSIG { stack_holder.push(result_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_checkblssig))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_checkblssig, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/signature/op_checkblssigagg.rs b/src/executive/vm/opcodes/opcodes/signature/op_checkblssigagg.rs index 9d194648..dd1997e6 100644 --- a/src/executive/vm/opcodes/opcodes/signature/op_checkblssigagg.rs +++ b/src/executive/vm/opcodes/opcodes/signature/op_checkblssigagg.rs @@ -4,8 +4,8 @@ use crate::executive::stack::{ stack_item::StackItem, stack_uint::StackItemUintExt, }; -use crate::transmutative::bls::verify::bls_verify_aggregate; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; +use crate::transmutative::bls::verify::bls_verify_aggregate; use serde::{Deserialize, Serialize}; /// Checks a BLS aggregate signature against a set of keys and messages. diff --git a/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsig.rs b/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsig.rs index c58acdb7..c717a3ff 100644 --- a/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsig.rs +++ b/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsig.rs @@ -105,7 +105,9 @@ impl OP_CHECKSCHNORRSIG { stack_holder.push(result_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_checkschnorrsig))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_checkschnorrsig, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsigbip340.rs b/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsigbip340.rs index 216553db..28e9ff1e 100644 --- a/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsigbip340.rs +++ b/src/executive/vm/opcodes/opcodes/signature/op_checkschnorrsigbip340.rs @@ -106,7 +106,9 @@ impl OP_CHECKSCHNORRSIGBIP340 { stack_holder.push(result_item)?; // Increment the ops counter. - stack_holder.increment_ops(OpcodeOpsParams::as_u32(stack_holder.opcode_ops().op_checkschnorrsigbip340))?; + stack_holder.increment_ops(OpcodeOpsParams::as_u32( + stack_holder.opcode_ops().op_checkschnorrsigbip340, + ))?; Ok(()) } diff --git a/src/executive/vm/opcodes/opcodes/splice/op_cat.rs b/src/executive/vm/opcodes/opcodes/splice/op_cat.rs index 2b9698f5..b1bfecc0 100644 --- a/src/executive/vm/opcodes/opcodes/splice/op_cat.rs +++ b/src/executive/vm/opcodes/opcodes/splice/op_cat.rs @@ -1,5 +1,5 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem}, +use crate::executive::stack::{ + stack_error::StackError, stack_holder::StackHolder, stack_item::StackItem, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/splice/op_left.rs b/src/executive/vm/opcodes/opcodes/splice/op_left.rs index 9aecf396..d9f1cbd6 100644 --- a/src/executive/vm/opcodes/opcodes/splice/op_left.rs +++ b/src/executive/vm/opcodes/opcodes/splice/op_left.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/splice/op_right.rs b/src/executive/vm/opcodes/opcodes/splice/op_right.rs index ee3ef814..0020e083 100644 --- a/src/executive/vm/opcodes/opcodes/splice/op_right.rs +++ b/src/executive/vm/opcodes/opcodes/splice/op_right.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/splice/op_size.rs b/src/executive/vm/opcodes/opcodes/splice/op_size.rs index 2c9a9fba..d9116cb6 100644 --- a/src/executive/vm/opcodes/opcodes/splice/op_size.rs +++ b/src/executive/vm/opcodes/opcodes/splice/op_size.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::StackError, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::StackError, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/splice/op_split.rs b/src/executive/vm/opcodes/opcodes/splice/op_split.rs index f2b23f8a..39f3c55b 100644 --- a/src/executive/vm/opcodes/opcodes/splice/op_split.rs +++ b/src/executive/vm/opcodes/opcodes/splice/op_split.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt}, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_2drop.rs b/src/executive/vm/opcodes/opcodes/stack/op_2drop.rs index d6288d5e..12df36b6 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_2drop.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_2drop.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_2dup.rs b/src/executive/vm/opcodes/opcodes/stack/op_2dup.rs index f8825b82..918cbc1a 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_2dup.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_2dup.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_2over.rs b/src/executive/vm/opcodes/opcodes/stack/op_2over.rs index 0a935144..b9a65db8 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_2over.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_2over.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// Copies the pair of items two spaces back in the stack to the front. diff --git a/src/executive/vm/opcodes/opcodes/stack/op_2rot.rs b/src/executive/vm/opcodes/opcodes/stack/op_2rot.rs index 879a7828..9b4212a5 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_2rot.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_2rot.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_2swap.rs b/src/executive/vm/opcodes/opcodes/stack/op_2swap.rs index a522528f..4c70a72a 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_2swap.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_2swap.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_3dup.rs b/src/executive/vm/opcodes/opcodes/stack/op_3dup.rs index 82f562fa..7c884f76 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_3dup.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_3dup.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_depth.rs b/src/executive/vm/opcodes/opcodes/stack/op_depth.rs index dd34bb0d..b2eee346 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_depth.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_depth.rs @@ -1,10 +1,8 @@ -use crate::executive::{ - stack::{ - stack_error::StackError, - stack_holder::StackHolder, - stack_item::StackItem, - stack_uint::{SafeConverter, StackItemUintExt, StackUint}, - }, +use crate::executive::stack::{ + stack_error::StackError, + stack_holder::StackHolder, + stack_item::StackItem, + stack_uint::{SafeConverter, StackItemUintExt, StackUint}, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_drop.rs b/src/executive/vm/opcodes/opcodes/stack/op_drop.rs index 859277fa..4666db39 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_drop.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_drop.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_dup.rs b/src/executive/vm/opcodes/opcodes/stack/op_dup.rs index 8d603bd9..2d173ec0 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_dup.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_dup.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_ifdup.rs b/src/executive/vm/opcodes/opcodes/stack/op_ifdup.rs index 601188cd..eef2de87 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_ifdup.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_ifdup.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_nip.rs b/src/executive/vm/opcodes/opcodes/stack/op_nip.rs index 6c6d8dbf..bb0fb51f 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_nip.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_nip.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_over.rs b/src/executive/vm/opcodes/opcodes/stack/op_over.rs index 40e16b9b..03f65457 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_over.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_over.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_pick.rs b/src/executive/vm/opcodes/opcodes/stack/op_pick.rs index b9766683..34a5134a 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_pick.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_pick.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_roll.rs b/src/executive/vm/opcodes/opcodes/stack/op_roll.rs index 9037ccde..3a8656ca 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_roll.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_roll.rs @@ -1,9 +1,7 @@ -use crate::executive::{ - stack::{ - stack_error::{StackError, StackUintError}, - stack_holder::StackHolder, - stack_uint::StackItemUintExt, - }, +use crate::executive::stack::{ + stack_error::{StackError, StackUintError}, + stack_holder::StackHolder, + stack_uint::StackItemUintExt, }; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_rot.rs b/src/executive/vm/opcodes/opcodes/stack/op_rot.rs index 71a1b8ef..45518d57 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_rot.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_rot.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_swap.rs b/src/executive/vm/opcodes/opcodes/stack/op_swap.rs index cb3cc7d0..16a2217a 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_swap.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_swap.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/stack/op_tuck.rs b/src/executive/vm/opcodes/opcodes/stack/op_tuck.rs index 76ba9c72..180a31b8 100644 --- a/src/executive/vm/opcodes/opcodes/stack/op_tuck.rs +++ b/src/executive/vm/opcodes/opcodes/stack/op_tuck.rs @@ -1,6 +1,4 @@ -use crate::executive::{ - stack::{stack_error::StackError, stack_holder::StackHolder}, -}; +use crate::executive::stack::{stack_error::StackError, stack_holder::StackHolder}; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; diff --git a/src/executive/vm/opcodes/opcodes/storage/op_sfree.rs b/src/executive/vm/opcodes/opcodes/storage/op_sfree.rs index a04a2310..4782f74e 100644 --- a/src/executive/vm/opcodes/opcodes/storage/op_sfree.rs +++ b/src/executive/vm/opcodes/opcodes/storage/op_sfree.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ limits::{MAX_KEY_LENGTH, MIN_KEY_LENGTH}, @@ -7,7 +8,6 @@ use crate::{ }, inscriptive::state_manager::state_manager::STATE_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// The `OP_SFREE` opcode. diff --git a/src/executive/vm/opcodes/opcodes/storage/op_sread.rs b/src/executive/vm/opcodes/opcodes/storage/op_sread.rs index 0cbdeb25..78fa693f 100644 --- a/src/executive/vm/opcodes/opcodes/storage/op_sread.rs +++ b/src/executive/vm/opcodes/opcodes/storage/op_sread.rs @@ -1,3 +1,4 @@ +use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use crate::{ executive::stack::{ limits::{MAX_KEY_LENGTH, MIN_KEY_LENGTH}, @@ -7,7 +8,6 @@ use crate::{ }, inscriptive::state_manager::state_manager::STATE_MANAGER, }; -use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; use serde::{Deserialize, Serialize}; /// The `OP_SREAD` opcode. diff --git a/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs b/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs index 18085d40..1d21a7a2 100644 --- a/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs +++ b/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs @@ -3,8 +3,8 @@ use crate::executive::stack::{ stack_error::{StackError, StorageError}, stack_holder::StackHolder, }; -use crate::inscriptive::state_manager::state_manager::STATE_MANAGER; use crate::inscriptive::params_manager::params_holder::opcode_ops_params::OpcodeOpsParams; +use crate::inscriptive::state_manager::state_manager::STATE_MANAGER; use serde::{Deserialize, Serialize}; /// The `OP_SWRITE` opcode. diff --git a/src/executive/vm/program_execution/exec.rs b/src/executive/vm/program_execution/exec.rs index 2304eb70..4cc4df05 100644 --- a/src/executive/vm/program_execution/exec.rs +++ b/src/executive/vm/program_execution/exec.rs @@ -90,8 +90,8 @@ use crate::{ }, inscriptive::{ coin_manager::coin_manager::COIN_MANAGER, - params_manager::params_holder::params_holder::ParamsHolder, - registry::registry::REGISTRY, state_manager::state_manager::STATE_MANAGER, + params_manager::params_holder::params_holder::ParamsHolder, registry::registry::REGISTRY, + state_manager::state_manager::STATE_MANAGER, }, }; @@ -204,11 +204,9 @@ pub async fn execute( let payable_allocation_in_satoshis = payable_allocation_value as u64; let account_balance = { let _coin_manager = coin_manager.lock().await; - _coin_manager - .get_account_balance(caller_key) - .ok_or(ExecutionError::PayableAllocationAccountNotFoundError( - caller_key, - ))? + _coin_manager.get_account_balance(caller_key).ok_or( + ExecutionError::PayableAllocationAccountNotFoundError(caller_key), + )? }; if account_balance < payable_allocation_in_satoshis { return Err( diff --git a/src/executive/vm/stack/stack_error.rs b/src/executive/vm/stack/stack_error.rs index 1916622b..3d1d8e97 100644 --- a/src/executive/vm/stack/stack_error.rs +++ b/src/executive/vm/stack/stack_error.rs @@ -9,8 +9,7 @@ use crate::inscriptive::{ CMShadowDownAllError, CMShadowDownError, CMShadowUpAllError, CMShadowUpError, }, state_manager::errors::{ - insert_update_state_error::SMInsertUpdateStateError, - remove_state_error::SMRemoveStateError, + insert_update_state_error::SMInsertUpdateStateError, remove_state_error::SMRemoveStateError, }, }; diff --git a/src/inscriptive/params_manager/params_holder/opcode_ops_params.rs b/src/inscriptive/params_manager/params_holder/opcode_ops_params.rs index 3a20a3a5..2927967d 100644 --- a/src/inscriptive/params_manager/params_holder/opcode_ops_params.rs +++ b/src/inscriptive/params_manager/params_holder/opcode_ops_params.rs @@ -300,4 +300,3 @@ impl OpcodeOpsParams { value.min(u32::MAX as u64) as u32 } } - diff --git a/src/inscriptive/params_manager/params_keys.rs b/src/inscriptive/params_manager/params_keys.rs index 520daec0..d8e490b1 100644 --- a/src/inscriptive/params_manager/params_keys.rs +++ b/src/inscriptive/params_manager/params_keys.rs @@ -3,11 +3,14 @@ pub const PARAMS_CATEGORY_OPCODE_OPS: u8 = 0x01; pub const PARAMS_HOLDER_TREE_NAME: [u8; 13] = *b"params_holder"; -pub const ACCOUNT_CAN_INITIALLY_DEPLOY_LIQUIDITY_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x00]; -pub const ACCOUNT_CAN_INITIALLY_DEPLOY_CONTRACT_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x01]; +pub const ACCOUNT_CAN_INITIALLY_DEPLOY_LIQUIDITY_SPECIAL_DB_KEY: [u8; 2] = + [PARAMS_CATEGORY_CASUAL, 0x00]; +pub const ACCOUNT_CAN_INITIALLY_DEPLOY_CONTRACT_SPECIAL_DB_KEY: [u8; 2] = + [PARAMS_CATEGORY_CASUAL, 0x01]; pub const MOVE_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x02]; pub const CALL_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x03]; -pub const CALL_ENTRY_PPM_CALLDATA_BYTESIZE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x04]; +pub const CALL_ENTRY_PPM_CALLDATA_BYTESIZE_FEE_SPECIAL_DB_KEY: [u8; 2] = + [PARAMS_CATEGORY_CASUAL, 0x04]; pub const LIFTUP_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x05]; pub const LIFTUP_ENTRY_PER_LIFT_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x06]; pub const MOVE_PPM_LIQUIDITY_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x07]; @@ -16,7 +19,8 @@ pub const SWAPOUT_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASU pub const CONFIG_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x0A]; pub const CONFIG_ENTRY_PER_CONFIG_BYTE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x0B]; pub const DEPLOY_ENTRY_BASE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x0C]; -pub const DEPLOY_ENTRY_PER_PROGRAM_BYTE_FEE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_CASUAL, 0x0D]; +pub const DEPLOY_ENTRY_PER_PROGRAM_BYTE_FEE_SPECIAL_DB_KEY: [u8; 2] = + [PARAMS_CATEGORY_CASUAL, 0x0D]; pub const OP_FALSE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, 0x00]; pub const OP_TRUE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, 0x01]; @@ -160,4 +164,3 @@ pub const OP_UPDATE_PARAM_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, pub const OP_GOV_ACCOUNT_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, 0x8B]; pub const OP_GOV_CONTRACT_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, 0x8C]; pub const OP_RECONSTITUTE_SPECIAL_DB_KEY: [u8; 2] = [PARAMS_CATEGORY_OPCODE_OPS, 0x8D]; - diff --git a/src/inscriptive/params_manager/params_manager.rs b/src/inscriptive/params_manager/params_manager.rs index 74853759..d5499b3b 100644 --- a/src/inscriptive/params_manager/params_manager.rs +++ b/src/inscriptive/params_manager/params_manager.rs @@ -76,7 +76,8 @@ impl ParamsManager { } 0x04 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.call_entry_ppm_calldata_bytesize_fee = u64::from_le_bytes(bytes); + params_holder.call_entry_ppm_calldata_bytesize_fee = + u64::from_le_bytes(bytes); } } 0x05 => { @@ -86,7 +87,8 @@ impl ParamsManager { } 0x06 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.liftup_entry_per_lift_base_fee = u64::from_le_bytes(bytes); + params_holder.liftup_entry_per_lift_base_fee = + u64::from_le_bytes(bytes); } } 0x07 => { @@ -111,7 +113,8 @@ impl ParamsManager { } 0x0B => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.config_entry_per_config_byte_fee = u64::from_le_bytes(bytes); + params_holder.config_entry_per_config_byte_fee = + u64::from_le_bytes(bytes); } } 0x0C => { @@ -121,7 +124,8 @@ impl ParamsManager { } 0x0D => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.deploy_entry_per_program_byte_fee = u64::from_le_bytes(bytes); + params_holder.deploy_entry_per_program_byte_fee = + u64::from_le_bytes(bytes); } } _ => (), @@ -219,7 +223,8 @@ impl ParamsManager { } 0x12 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_pushdata_per_byte = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_pushdata_per_byte = + u64::from_le_bytes(bytes); } } 0x13 => { @@ -544,7 +549,8 @@ impl ParamsManager { } 0x53 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_greaterthanorequal = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_greaterthanorequal = + u64::from_le_bytes(bytes); } } 0x54 => { @@ -609,12 +615,14 @@ impl ParamsManager { } 0x60 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_taggedhash_per_byte_gap = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_taggedhash_per_byte_gap = + u64::from_le_bytes(bytes); } } 0x61 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_taggedhash_output_len = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_taggedhash_output_len = + u64::from_le_bytes(bytes); } } 0x62 => { @@ -624,7 +632,8 @@ impl ParamsManager { } 0x63 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_blake2bvar_per_byte = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_blake2bvar_per_byte = + u64::from_le_bytes(bytes); } } 0x64 => { @@ -634,7 +643,8 @@ impl ParamsManager { } 0x65 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_blake2svar_per_byte = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_blake2svar_per_byte = + u64::from_le_bytes(bytes); } } 0x66 => { @@ -659,17 +669,20 @@ impl ParamsManager { } 0x6A => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_pushsecpgeneratorpoint = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_pushsecpgeneratorpoint = + u64::from_le_bytes(bytes); } } 0x6B => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_iszerosecpscalar = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_iszerosecpscalar = + u64::from_le_bytes(bytes); } } 0x6C => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_isinfinitesecppoint = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_isinfinitesecppoint = + u64::from_le_bytes(bytes); } } 0x6D => { @@ -679,7 +692,8 @@ impl ParamsManager { } 0x6E => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_checkschnorrsigbip340 = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_checkschnorrsigbip340 = + u64::from_le_bytes(bytes); } } 0x6F => { @@ -689,12 +703,14 @@ impl ParamsManager { } 0x70 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_checkblssigagg_base = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_checkblssigagg_base = + u64::from_le_bytes(bytes); } } 0x71 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_checkblssigagg_per_count = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_checkblssigagg_per_count = + u64::from_le_bytes(bytes); } } 0x72 => { @@ -764,12 +780,14 @@ impl ParamsManager { } 0x7F => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_shadow_has_alloc = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_shadow_has_alloc = + u64::from_le_bytes(bytes); } } 0x80 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_shadow_alloc_val = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_shadow_alloc_val = + u64::from_le_bytes(bytes); } } 0x81 => { @@ -794,12 +812,14 @@ impl ParamsManager { } 0x85 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_shadow_num_allocs = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_shadow_num_allocs = + u64::from_le_bytes(bytes); } } 0x86 => { if let Ok(bytes) = value.as_ref().try_into() { - params_holder.opcode_ops.op_shadow_allocs_sum = u64::from_le_bytes(bytes); + params_holder.opcode_ops.op_shadow_allocs_sum = + u64::from_le_bytes(bytes); } } 0x87 => { @@ -897,19 +917,23 @@ impl ParamsManager { self.get_mut_ephemeral_params_holder().call_entry_base_fee = value; } pub fn set_call_entry_ppm_calldata_bytesize_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().call_entry_ppm_calldata_bytesize_fee = value; + self.get_mut_ephemeral_params_holder() + .call_entry_ppm_calldata_bytesize_fee = value; } pub fn set_liftup_entry_base_fee(&mut self, value: u64) { self.get_mut_ephemeral_params_holder().liftup_entry_base_fee = value; } pub fn set_liftup_entry_per_lift_base_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().liftup_entry_per_lift_base_fee = value; + self.get_mut_ephemeral_params_holder() + .liftup_entry_per_lift_base_fee = value; } pub fn set_move_ppm_liquidity_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().move_ppm_liquidity_fee = value; + self.get_mut_ephemeral_params_holder() + .move_ppm_liquidity_fee = value; } pub fn set_in_call_ppm_liquidity_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().in_call_ppm_liquidity_fee = value; + self.get_mut_ephemeral_params_holder() + .in_call_ppm_liquidity_fee = value; } pub fn set_swapout_entry_base_fee(&mut self, value: u64) { self.get_mut_ephemeral_params_holder() @@ -919,13 +943,15 @@ impl ParamsManager { self.get_mut_ephemeral_params_holder().config_entry_base_fee = value; } pub fn set_config_entry_per_config_byte_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().config_entry_per_config_byte_fee = value; + self.get_mut_ephemeral_params_holder() + .config_entry_per_config_byte_fee = value; } pub fn set_deploy_entry_base_fee(&mut self, value: u64) { self.get_mut_ephemeral_params_holder().deploy_entry_base_fee = value; } pub fn set_deploy_entry_per_program_byte_fee(&mut self, value: u64) { - self.get_mut_ephemeral_params_holder().deploy_entry_per_program_byte_fee = value; + self.get_mut_ephemeral_params_holder() + .deploy_entry_per_program_byte_fee = value; } /// Reverts the ephemeral changes associated with the last execution. From b44a3a7fa953047c2dec910138145d8a2ab2aa0d Mon Sep 17 00:00:00 2001 From: GideonBature Date: Tue, 9 Jun 2026 03:52:39 +0100 Subject: [PATCH 3/3] Fix clippy errors --- src/executive/vm/opcodes/opcodes/storage/op_swrite.rs | 2 +- src/executive/vm/program_execution/exec.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs b/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs index 1d21a7a2..aed33f89 100644 --- a/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs +++ b/src/executive/vm/opcodes/opcodes/storage/op_swrite.rs @@ -60,7 +60,7 @@ impl OP_SWRITE { } // Calculate the number of ops. - let ops = calculate_ops(key.len() as u32, value.len() as u32, stack_holder); + let ops = calculate_ops(key.len(), value.len(), stack_holder); // Increment the ops counter. stack_holder.increment_ops(ops)?; diff --git a/src/executive/vm/program_execution/exec.rs b/src/executive/vm/program_execution/exec.rs index 4cc4df05..f469a2ce 100644 --- a/src/executive/vm/program_execution/exec.rs +++ b/src/executive/vm/program_execution/exec.rs @@ -876,7 +876,7 @@ pub async fn execute( Opcode::OP_SFREE(OP_SFREE) => { OP_SFREE::execute(&mut stack_holder, state_manager) .await - .map_err(|error| ExecutionError::OpcodeExecutionError(error))?; + .map_err(ExecutionError::OpcodeExecutionError)?; } // Memory opcodes. @@ -896,19 +896,19 @@ pub async fn execute( // Governance opcodes. Opcode::OP_UPDATE_PARAM(OP_UPDATE_PARAM) => { OP_UPDATE_PARAM::execute(&mut stack_holder) - .map_err(|error| ExecutionError::OpcodeExecutionError(error))?; + .map_err(ExecutionError::OpcodeExecutionError)?; } Opcode::OP_GOV_ACCOUNT(OP_GOV_ACCOUNT) => { OP_GOV_ACCOUNT::execute(&mut stack_holder) - .map_err(|error| ExecutionError::OpcodeExecutionError(error))?; + .map_err(ExecutionError::OpcodeExecutionError)?; } Opcode::OP_GOV_CONTRACT(OP_GOV_CONTRACT) => { OP_GOV_CONTRACT::execute(&mut stack_holder) - .map_err(|error| ExecutionError::OpcodeExecutionError(error))?; + .map_err(ExecutionError::OpcodeExecutionError)?; } Opcode::OP_RECONSTITUTE(OP_RECONSTITUTE) => { OP_RECONSTITUTE::execute(&mut stack_holder) - .map_err(|error| ExecutionError::OpcodeExecutionError(error))?; + .map_err(ExecutionError::OpcodeExecutionError)?; } } }