From 7c22ea70d508f37d4eaf94c74ce6ee9722fe4947 Mon Sep 17 00:00:00 2001 From: Liam Monninger Date: Thu, 14 Nov 2024 16:25:13 +0100 Subject: [PATCH] fix: bad merge elements. --- .../suzuka/suzuka-full-node/src/partial.rs | 4 +++- protocol-units/execution/dof/src/v1.rs | 24 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/networks/suzuka/suzuka-full-node/src/partial.rs b/networks/suzuka/suzuka-full-node/src/partial.rs index 43dda8a0d..e322f032b 100644 --- a/networks/suzuka/suzuka-full-node/src/partial.rs +++ b/networks/suzuka/suzuka-full-node/src/partial.rs @@ -31,7 +31,9 @@ where /// Runs the executor until crash or shutdown. pub async fn run(self) -> Result<(), anyhow::Error> { let (transaction_sender, transaction_receiver) = mpsc::channel(16); - let (context, exec_background) = self.executor.background(transaction_sender)?; + let (context, exec_background) = self + .executor + .background(transaction_sender, &self.config.execution_config.maptos_config)?; let services = context.services(); let mut movement_rest = self.movement_rest; movement_rest.set_context(services.opt_api_context()); diff --git a/protocol-units/execution/dof/src/v1.rs b/protocol-units/execution/dof/src/v1.rs index 20e1b2230..35a9e731a 100644 --- a/protocol-units/execution/dof/src/v1.rs +++ b/protocol-units/execution/dof/src/v1.rs @@ -221,9 +221,9 @@ mod tests { let private_key = Ed25519PrivateKey::generate_for_testing(); let mut config = Config::default(); config.chain.maptos_private_key = private_key.clone(); - let (executor, _tempdir) = setup(config)?; + let (executor, _tempdir) = setup(config.clone())?; let (tx_sender, mut tx_receiver) = mpsc::channel(16); - let (context, background) = executor.background(tx_sender)?; + let (context, background) = executor.background(tx_sender, &config)?; let services = context.services(); let api = services.get_opt_apis(); @@ -253,8 +253,8 @@ mod tests { config.chain.maptos_private_key = private_key.clone(); config.chain.maptos_read_only = true; let (tx_sender, _tx_receiver) = mpsc::channel(16); - let (executor, _tempdir) = setup(config)?; - let (context, background) = executor.background(tx_sender)?; + let (executor, _tempdir) = setup(config.clone())?; + let (context, background) = executor.background(tx_sender, &config)?; let services = context.services(); let api = services.get_opt_apis(); @@ -281,9 +281,9 @@ mod tests { let private_key = Ed25519PrivateKey::generate_for_testing(); let mut config = Config::default(); config.chain.maptos_private_key = private_key.clone(); - let (executor, _tempdir) = setup(config)?; + let (executor, _tempdir) = setup(config.clone())?; let (tx_sender, mut tx_receiver) = mpsc::channel(16); - let (context, background) = executor.background(tx_sender)?; + let (context, background) = executor.background(tx_sender, &config)?; let services = context.services(); let api = services.get_opt_apis(); @@ -340,9 +340,9 @@ mod tests { let private_key = Ed25519PrivateKey::generate_for_testing(); let mut config = Config::default(); config.chain.maptos_private_key = private_key.clone(); - let (executor, _tempdir) = setup(config)?; + let (executor, _tempdir) = setup(config.clone())?; let (tx_sender, mut tx_receiver) = mpsc::channel(16); - let (context, background) = executor.background(tx_sender)?; + let (context, background) = executor.background(tx_sender, &config)?; let services = context.services(); let api = services.get_opt_apis(); @@ -422,8 +422,8 @@ mod tests { // Create an executor instance from the environment configuration. let config = Config::default(); let (tx_sender, _tx_receiver) = mpsc::channel(16); - let executor = Executor::try_from_config(config)?; - let (context, background) = executor.background(tx_sender)?; + let executor = Executor::try_from_config(config.clone())?; + let (context, background) = executor.background(tx_sender, &config)?; let config = executor.config(); let services = context.services(); let apis = services.get_opt_apis(); @@ -495,8 +495,8 @@ mod tests { // Create an executor instance from the environment configuration. let config = Config::default(); let (tx_sender, _tx_receiver) = mpsc::channel(16); - let executor = Executor::try_from_config(config)?; - let (context, background) = executor.background(tx_sender)?; + let executor = Executor::try_from_config(config.clone())?; + let (context, background) = executor.background(tx_sender, &config)?; let config = executor.config(); let services = context.services();