From 42ac372b242f8feabd25a36224dec371da1221bb Mon Sep 17 00:00:00 2001 From: 0xKitsune <0xKitsune@protonmail.com> Date: Thu, 15 Aug 2024 15:59:15 -0700 Subject: [PATCH 1/5] clippy --- bin/opt8n/src/cmd/server.rs | 2 +- bin/opt8n/src/opt8n.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/opt8n/src/cmd/server.rs b/bin/opt8n/src/cmd/server.rs index 19a2efa..71e80de 100644 --- a/bin/opt8n/src/cmd/server.rs +++ b/bin/opt8n/src/cmd/server.rs @@ -13,7 +13,7 @@ pub struct ServerArgs { impl ServerArgs { pub async fn run(&self) -> color_eyre::Result<()> { - let mut opt8n = Opt8n::new( + let opt8n = Opt8n::new( Some(self.node_args.clone()), self.opt8n_args.output.clone(), self.opt8n_args.genesis.clone(), diff --git a/bin/opt8n/src/opt8n.rs b/bin/opt8n/src/opt8n.rs index f031da6..f394f9a 100644 --- a/bin/opt8n/src/opt8n.rs +++ b/bin/opt8n/src/opt8n.rs @@ -8,7 +8,6 @@ use anvil_core::eth::block::Block; use anvil_core::eth::transaction::PendingTransaction; use cast::traces::{GethTraceBuilder, TracingInspectorConfig}; use clap::Parser; -use forge_script::ScriptArgs; use std::{ error::Error, fs::{self, File}, From 2acb575a397e8d17e47fc43bc82cae4e8dbe0f23 Mon Sep 17 00:00:00 2001 From: 0xKitsune <0xKitsune@protonmail.com> Date: Tue, 20 Aug 2024 17:03:31 -0400 Subject: [PATCH 2/5] clippy --- bin/opt8n/src/cmd/server.rs | 12 ++++++------ bin/opt8n/src/opt8n.rs | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/bin/opt8n/src/cmd/server.rs b/bin/opt8n/src/cmd/server.rs index 71e80de..4c71f83 100644 --- a/bin/opt8n/src/cmd/server.rs +++ b/bin/opt8n/src/cmd/server.rs @@ -13,12 +13,12 @@ pub struct ServerArgs { impl ServerArgs { pub async fn run(&self) -> color_eyre::Result<()> { - let opt8n = Opt8n::new( - Some(self.node_args.clone()), - self.opt8n_args.output.clone(), - self.opt8n_args.genesis.clone(), - ) - .await?; + // let opt8n = Opt8n::new( + // Some(self.node_args.clone()), + // self.opt8n_args.output.clone(), + // self.opt8n_args.genesis.clone(), + // ) + // .await?; Ok(()) } diff --git a/bin/opt8n/src/opt8n.rs b/bin/opt8n/src/opt8n.rs index f394f9a..b41d159 100644 --- a/bin/opt8n/src/opt8n.rs +++ b/bin/opt8n/src/opt8n.rs @@ -15,7 +15,6 @@ use std::{ }; use color_eyre::eyre::{ensure, eyre, Result}; -use futures::StreamExt; use op_test_vectors::execution::{ExecutionFixture, ExecutionReceipt, ExecutionResult}; use revm::{ db::{AlloyDB, CacheDB}, From 698a91f84ce7d3b7e2a3a3765d19203784714473 Mon Sep 17 00:00:00 2001 From: 0xKitsune <0xKitsune@protonmail.com> Date: Tue, 20 Aug 2024 17:06:03 -0400 Subject: [PATCH 3/5] unused import --- bin/opt8n/src/cmd/server.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/opt8n/src/cmd/server.rs b/bin/opt8n/src/cmd/server.rs index 4c71f83..bfbf56e 100644 --- a/bin/opt8n/src/cmd/server.rs +++ b/bin/opt8n/src/cmd/server.rs @@ -1,7 +1,7 @@ use anvil::cmd::NodeArgs; use clap::Parser; -use crate::opt8n::{Opt8n, Opt8nArgs}; +use crate::opt8n::Opt8nArgs; #[derive(Parser, Clone, Debug)] pub struct ServerArgs { From 3ed857860301f3d17705abeabe3c8a9e9e119831 Mon Sep 17 00:00:00 2001 From: 0xKitsune <77890308+0xKitsune@users.noreply.github.com> Date: Tue, 20 Aug 2024 18:36:58 -0400 Subject: [PATCH 4/5] Update bin/opt8n/src/cmd/server.rs Co-authored-by: refcell --- bin/opt8n/src/cmd/server.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/bin/opt8n/src/cmd/server.rs b/bin/opt8n/src/cmd/server.rs index bfbf56e..7ec514b 100644 --- a/bin/opt8n/src/cmd/server.rs +++ b/bin/opt8n/src/cmd/server.rs @@ -13,13 +13,6 @@ pub struct ServerArgs { impl ServerArgs { pub async fn run(&self) -> color_eyre::Result<()> { - // let opt8n = Opt8n::new( - // Some(self.node_args.clone()), - // self.opt8n_args.output.clone(), - // self.opt8n_args.genesis.clone(), - // ) - // .await?; - - Ok(()) + unimplemented!() } } From b3366b922953bfe0046b7a23878e165be759b3d2 Mon Sep 17 00:00:00 2001 From: 0xKitsune <0xkitsune@protonmail.com> Date: Tue, 20 Aug 2024 18:39:42 -0400 Subject: [PATCH 5/5] remove Counter.s.sol --- examples/exec-scripts/lib/forge-std | 2 +- examples/exec-scripts/script/Counter.s.sol | 30 ---------------------- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 examples/exec-scripts/script/Counter.s.sol diff --git a/examples/exec-scripts/lib/forge-std b/examples/exec-scripts/lib/forge-std index 2cbff06..bf66061 160000 --- a/examples/exec-scripts/lib/forge-std +++ b/examples/exec-scripts/lib/forge-std @@ -1 +1 @@ -Subproject commit 2cbff0602d340503dba9828ab6981053704d1384 +Subproject commit bf6606142994b1e47e2882ce0cd477c020d77623 diff --git a/examples/exec-scripts/script/Counter.s.sol b/examples/exec-scripts/script/Counter.s.sol deleted file mode 100644 index 06b2e92..0000000 --- a/examples/exec-scripts/script/Counter.s.sol +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.13; - -import {Script, console} from "forge-std/Script.sol"; - -contract CounterScript is Script { - Counter public counter; - - function setUp() public {} - - function run() public { - vm.startBroadcast(); - - counter = new Counter(); - - vm.stopBroadcast(); - } -} - -contract Counter { - uint256 public number; - - function setNumber(uint256 newNumber) public { - number = newNumber; - } - - function increment() public { - number++; - } -}