Skip to content

Commit

Permalink
fix: bad merge elements.
Browse files Browse the repository at this point in the history
  • Loading branch information
l-monninger committed Nov 14, 2024
1 parent de08cff commit 7c22ea7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion networks/suzuka/suzuka-full-node/src/partial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
24 changes: 12 additions & 12 deletions protocol-units/execution/dof/src/v1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand All @@ -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();

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 7c22ea7

Please sign in to comment.