interactor refactor

framework/snippets/src/interactor_multi_sc_exec.rs

@@ -1,6 +1,6 @@
 use crate::{
     interactor_multi_sc_process::{update_nonces_and_sign_tx, SenderSet, Txs},
-    Interactor, StepBuffer, TransactionSpec,
+    Interactor, InteractorStep, StepBuffer,
 };
 
 use multiversx_sc_scenario::scenario_model::TxResponse;
@@ -32,7 +32,7 @@ impl Interactor {
 
         for sc_call_step in &mut buffer.refs {
             let mut transaction = sc_call_step.to_transaction(self);
-            let sender_address = &sc_call_step.to_address().value;
+            let sender_address = &sc_call_step.sender_address().value;
             let sender = self
                 .sender_map
                 .get_mut(sender_address)
@@ -45,11 +45,11 @@ impl Interactor {
     }
 }
 
-fn retrieve_senders(sc_call_steps: &[&mut dyn TransactionSpec]) -> SenderSet {
+fn retrieve_senders(sc_call_steps: &[&mut dyn InteractorStep]) -> SenderSet {
     let mut senders = SenderSet::new();
 
     for sc_call_step in sc_call_steps {
-        let sender_address = &sc_call_step.to_address().value;
+        let sender_address = &sc_call_step.sender_address().value;
         senders.insert(sender_address.clone());
     }
     senders

framework/snippets/src/interactor_tx_spec.rs → framework/snippets/src/interactor_step.rs

@@ -6,22 +6,23 @@ use multiversx_sdk::data::transaction::Transaction;
 
 use crate::Interactor;
 
-pub trait TransactionSpec {
+/// Describes a scenario step that can be executed in an interactor.
+pub trait InteractorStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction;
 
-    fn to_address(&self) -> &AddressValue;
+    fn sender_address(&self) -> &AddressValue;
 
     fn run_step(&mut self, step_runner: &mut dyn ScenarioRunner);
 
     fn set_response(&mut self, tx_response: TxResponse);
 }
 
-impl TransactionSpec for ScCallStep {
+impl InteractorStep for ScCallStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction {
         interactor.tx_call_to_blockchain_tx(&self.tx)
     }
 
-    fn to_address(&self) -> &AddressValue {
+    fn sender_address(&self) -> &AddressValue {
         &self.tx.from
     }
 
@@ -35,12 +36,12 @@ impl TransactionSpec for ScCallStep {
     }
 }
 
-impl TransactionSpec for ScDeployStep {
+impl InteractorStep for ScDeployStep {
     fn to_transaction(&self, interactor: &Interactor) -> Transaction {
         interactor.sc_deploy_to_blockchain_tx(self)
     }
 
-    fn to_address(&self) -> &AddressValue {
+    fn sender_address(&self) -> &AddressValue {
         &self.tx.from
     }
 

framework/snippets/src/interactor_tx/interactor_env_multi.rs

@@ -0,0 +1,16 @@
+use multiversx_sc_scenario::{
+    multiversx_sc::types::{RHListItemExec, TxEnv},
+    scenario_model::TxResponse,
+};
+
+use crate::TransactionSpec;
+
+// pub struct
+
+// /// TODO: move to scenario.
+// pub trait TxToStep<Env> where Env: TxEnv {
+//     type Step;
+//     type ResultHandler;
+
+//     fn tx_to_step(self) -> (Box<TransactionSpec>, Self::ResultHandler);
+// }

framework/snippets/src/lib.rs

@@ -8,8 +8,8 @@ mod interactor_sc_deploy;
 mod interactor_sc_extra;
 mod interactor_sc_transfer;
 mod interactor_sender;
+mod interactor_step;
 mod interactor_tx;
-mod interactor_tx_spec;
 mod interactor_vm_query;
 mod step_buffer;
 
@@ -18,8 +18,8 @@ pub use hex;
 pub use interactor::*;
 pub use interactor_dns::*;
 pub use interactor_sender::*;
+pub use interactor_step::InteractorStep;
 pub use interactor_tx::*;
-pub use interactor_tx_spec::*;
 pub use log;
 pub use multiversx_sc_scenario::{self, multiversx_sc};
 pub use multiversx_sdk as erdrs; // TODO: remove

framework/snippets/src/step_buffer.rs

@@ -1,10 +1,10 @@
 use multiversx_sc_scenario::scenario_model::{ScCallStep, ScDeployStep};
 
-use crate::TransactionSpec;
+use crate::InteractorStep;
 
 #[derive(Default)]
 pub struct StepBuffer<'a> {
-    pub refs: Vec<&'a mut dyn TransactionSpec>,
+    pub refs: Vec<&'a mut dyn InteractorStep>,
 }
 
 impl<'a> StepBuffer<'a> {
@@ -54,7 +54,7 @@ impl<'a> StepBuffer<'a> {
         buffer
     }
 
-    pub fn to_refs_vec(&'a self) -> Vec<&'a dyn TransactionSpec> {
+    pub fn to_refs_vec(&'a self) -> Vec<&'a dyn InteractorStep> {
         self.refs.iter().map(|r| &**r).collect()
     }
 }