From c3a2dc5e4461a7aa4cd66f30ddae032112b85620 Mon Sep 17 00:00:00 2001 From: Milosz Muszynski Date: Wed, 17 Jul 2024 11:33:08 +0200 Subject: [PATCH] rusk: renamed contract execution --- rusk/tests/services/contract_deployment.rs | 4 ++-- rusk/tests/services/gas_behavior.rs | 6 +++--- rusk/tests/services/stake.rs | 4 ++-- rusk/tests/services/unspendable.rs | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rusk/tests/services/contract_deployment.rs b/rusk/tests/services/contract_deployment.rs index bd64c50777..b5878320b4 100644 --- a/rusk/tests/services/contract_deployment.rs +++ b/rusk/tests/services/contract_deployment.rs @@ -9,7 +9,7 @@ use std::path::{Path, PathBuf}; use std::sync::{Arc, RwLock}; use execution_core::bytecode::Bytecode; -use execution_core::transfer::{CallOrDeploy, ContractDeploy}; +use execution_core::transfer::{ContractDeploy, ContractExec}; use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; @@ -115,7 +115,7 @@ fn make_and_execute_transaction_deploy( let tx = wallet .execute( &mut rng, - CallOrDeploy::Deploy(ContractDeploy { + ContractExec::Deploy(ContractDeploy { bytecode: Bytecode { hash, bytes: bytecode.as_ref().to_vec(), diff --git a/rusk/tests/services/gas_behavior.rs b/rusk/tests/services/gas_behavior.rs index a4ce5de665..6cecb1a971 100644 --- a/rusk/tests/services/gas_behavior.rs +++ b/rusk/tests/services/gas_behavior.rs @@ -8,7 +8,7 @@ use std::collections::HashMap; use std::path::Path; use std::sync::{Arc, RwLock}; -use execution_core::transfer::{CallOrDeploy, ContractCall}; +use execution_core::transfer::{ContractCall, ContractExec}; use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; @@ -75,7 +75,7 @@ fn make_transactions( let tx_0 = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call.clone()), + ContractExec::Call(contract_call.clone()), SENDER_INDEX_0, GAS_LIMIT_0, 1, @@ -89,7 +89,7 @@ fn make_transactions( let tx_1 = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call), + ContractExec::Call(contract_call), SENDER_INDEX_1, GAS_LIMIT_1, 1, diff --git a/rusk/tests/services/stake.rs b/rusk/tests/services/stake.rs index d44d36b1b1..09a4e5fb0f 100644 --- a/rusk/tests/services/stake.rs +++ b/rusk/tests/services/stake.rs @@ -8,7 +8,7 @@ use std::path::Path; use std::sync::{Arc, RwLock}; use execution_core::{ - transfer::{CallOrDeploy, ContractCall}, + transfer::{ContractCall, ContractExec}, StakePublicKey, }; use rand::prelude::*; @@ -205,7 +205,7 @@ fn wallet_reward( let tx = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call), + ContractExec::Call(contract_call), 0, GAS_LIMIT, 1, diff --git a/rusk/tests/services/unspendable.rs b/rusk/tests/services/unspendable.rs index 16fb297a4f..2b4ddddd9e 100644 --- a/rusk/tests/services/unspendable.rs +++ b/rusk/tests/services/unspendable.rs @@ -8,7 +8,7 @@ use std::collections::HashMap; use std::path::Path; use std::sync::{Arc, RwLock}; -use execution_core::transfer::{CallOrDeploy, ContractCall}; +use execution_core::transfer::{ContractCall, ContractExec}; use rand::prelude::*; use rand::rngs::StdRng; use rusk::{Result, Rusk}; @@ -87,7 +87,7 @@ fn make_transactions( let tx_0 = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call.clone()), + ContractExec::Call(contract_call.clone()), SENDER_INDEX_0, GAS_LIMIT_0, 1, @@ -101,7 +101,7 @@ fn make_transactions( let tx_1 = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call.clone()), + ContractExec::Call(contract_call.clone()), SENDER_INDEX_1, GAS_LIMIT_1, 1, @@ -115,7 +115,7 @@ fn make_transactions( let tx_2 = wallet .execute( &mut rng, - CallOrDeploy::Call(contract_call), + ContractExec::Call(contract_call), SENDER_INDEX_2, GAS_LIMIT_2, 1,