Skip to content

Commit

Permalink
chore: remove raft and simpleconsenus + refac (#1618)
Browse files Browse the repository at this point in the history
* chore: remove raft and simpleconsenus + refac

* remove unused deps

* fix build.rs
  • Loading branch information
carneiro-cw authored Aug 8, 2024
1 parent 92041c0 commit 844b616
Show file tree
Hide file tree
Showing 28 changed files with 15 additions and 3,573 deletions.
241 changes: 3 additions & 238 deletions Cargo.lock

Large diffs are not rendered by default.

7 changes: 1 addition & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ default-run = "stratus"
# general
anyhow = "=1.0.86"
async-trait = "=0.1.80"
byte-unit = "=5.1.4"
cfg-if = "=1.0.0"
chrono = { version = "=0.4.38", features = ["serde"] }
const_format = "=0.2.32"
Expand All @@ -33,12 +32,10 @@ oneshot = "=0.1.8"
paste = "=1.0.15"
phf = "=0.11.2"
pin-project = "=1.1.5"
quote = "=1.0.36"
rand = { version = "=0.8.5", features = ["small_rng"] }
strum = "=0.26.2"
sugars = "=3.0.1"
thiserror = "=1.0.61"
url = "=2.5.1"

# async
tokio = { version = "=1.38.0", features = ["rt-multi-thread", "macros", "signal"] }
Expand All @@ -51,7 +48,6 @@ dotenvy = "=0.15.7"
# serialization
bincode = { version = "=1.3.3" }
display_json = "=0.2.1"
prost = "=0.12.6"
prost-types = "=0.12.6"
serde = "=1.0.203"
serde_json = "=1.0.117"
Expand All @@ -69,7 +65,6 @@ futures-util = "=0.3.30"
ethabi = "=18.0.0"
ethereum-types = "=0.14.1"
ethers-core = "=2.0.14"
evm-disassembler = "=0.5.0"
keccak-hasher = "=0.15.3" # this version must be compatible with triehash
rlp = "=0.5.2"
triehash = "=0.8.4"
Expand Down Expand Up @@ -189,4 +184,4 @@ unused_async = "warn"
unused_self = "warn"
used_underscore_binding = "warn"
wildcard_imports = "warn"
unwrap_used = "allow"
unwrap_used = "allow"
11 changes: 0 additions & 11 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use vergen::EmitBuilder;
fn main() {
print_build_directives();
generate_build_info();
generate_proto_structs();
generate_contracts_structs();
generate_signatures_structs();
}
Expand All @@ -34,16 +33,6 @@ fn print_build_directives() {
println!("cargo:rerun-if-changed=.sqlx/");
}

// -----------------------------------------------------------------------------
// Code generation: Proto files
// -----------------------------------------------------------------------------
fn generate_proto_structs() {
tonic_build::configure()
.protoc_arg("--experimental_allow_proto3_optional")
.compile(&["static/proto/append_entry.proto"], &["static/proto"])
.expect("Compiling .proto structs should not fail");
}

// -----------------------------------------------------------------------------
// Code generation: Build Info
// -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use tokio::runtime::Builder;
use tokio::runtime::Runtime;

use crate::eth::executor::ExecutorConfig;
use crate::eth::importer::ImporterConfig;
use crate::eth::follower::importer::ImporterConfig;
use crate::eth::miner::MinerConfig;
use crate::eth::primitives::Address;
use crate::eth::rpc::RpcServerConfig;
Expand Down
Loading

0 comments on commit 844b616

Please sign in to comment.