github/akula
1
1
Fork 0
mirror of https://github.com/akula-bft/akula.git synced 2026-04-19 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update deps, remove tokio-console support

Browse Source
This commit is contained in:
Artem Vorotnikov
2021-12-19 20:47:48 +03:00
parent 28086a122c
commit fef8e5801d
6 changed files with 48 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
Cargo.lock generated
View File

@@ -2,12 +2,6 @@
# It is not intended for manual editing.
version = 3
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
version = "0.7.6"
@@ -44,7 +38,6 @@ dependencies = [
"bytes-literal",
"bytesize",
"clap",
"console-subscriber",
"croaring",
"crossterm",
"derive_more",
@@ -415,38 +408,6 @@ dependencies = [
"cc",
]
[[package]]
name = "console-api"
version = "0.1.0"
source = "git+https://github.com/tokio-rs/console#bbce8e78bab3277b6e533d50df3fb2a7463c3746"
dependencies = [
"prost",
"prost-types",
"tonic",
"tonic-build",
"tracing-core",
]
[[package]]
name = "console-subscriber"
version = "0.1.0"
source = "git+https://github.com/tokio-rs/console#bbce8e78bab3277b6e533d50df3fb2a7463c3746"
dependencies = [
"console-api",
"futures",
"hdrhistogram",
"humantime",
"serde",
"serde_json",
"thread_local",
"tokio",
"tokio-stream",
"tonic",
"tracing",
"tracing-core",
"tracing-subscriber",
]
[[package]]
name = "convert_case"
version = "0.4.0"
@@ -468,15 +429,6 @@ dependencies = [
"libc",
]
[[package]]
name = "crc32fast"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
dependencies = [
"cfg-if",
]
[[package]]
name = "croaring"
version = "0.5.1"
@@ -576,9 +528,9 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto-common"
version = "0.1.0"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f"
checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0"
dependencies = [
"generic-array",
]
@@ -633,9 +585,9 @@ dependencies = [
[[package]]
name = "digest"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d"
checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b"
dependencies = [
"block-buffer",
"crypto-common",
@@ -838,18 +790,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e"
[[package]]
name = "flate2"
version = "1.0.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
dependencies = [
"cfg-if",
"crc32fast",
"libc",
"miniz_oxide",
]
[[package]]
name = "fnv"
version = "1.0.7"
@@ -878,47 +818,26 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
[[package]]
name = "futures"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e"
dependencies = [
"futures-channel",
"futures-core",
"futures-io",
"futures-sink",
"futures-task",
"futures-util",
]
[[package]]
name = "futures-channel"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27"
checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b"
dependencies = [
"futures-core",
"futures-sink",
]
[[package]]
name = "futures-core"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445"
[[package]]
name = "futures-io"
version = "0.3.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11"
checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7"
[[package]]
name = "futures-macro"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd"
checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c"
dependencies = [
"proc-macro2",
"quote",
@@ -927,25 +846,24 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af"
checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508"
[[package]]
name = "futures-task"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12"
checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72"
[[package]]
name = "futures-util"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e"
checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164"
dependencies = [
"futures-core",
"futures-macro",
"futures-sink",
"futures-task",
"pin-project-lite",
"pin-utils",
@@ -1049,19 +967,6 @@ dependencies = [
"ahash",
]
[[package]]
name = "hdrhistogram"
version = "7.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6490be71f07a5f62b564bc58e36953f675833df11c7e4a0647bee7a07ca1ec5e"
dependencies = [
"base64",
"byteorder",
"flate2",
"nom",
"num-traits",
]
[[package]]
name = "heck"
version = "0.3.3"
@@ -1386,9 +1291,9 @@ dependencies = [
[[package]]
name = "lru"
version = "0.7.0"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c748cfe47cb8da225c37595b3108bea1c198c84aaae8ea0ba76d01dda9fc803"
checksum = "469898e909a1774d844793b347135a0cd344ca2f69d082013ecb8061a2229a3a"
dependencies = [
"hashbrown",
]
@@ -1447,16 +1352,6 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg 1.0.1",
]
[[package]]
name = "mio"
version = "0.7.14"
@@ -1568,9 +1463,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.8.0"
version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56"
checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5"
[[package]]
name = "parity-scale-codec"
@@ -1738,9 +1633,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.33"
version = "1.0.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a"
checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
dependencies = [
"unicode-xid",
]
@@ -2216,18 +2111,18 @@ checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
[[package]]
name = "serde"
version = "1.0.131"
version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ad69dfbd3e45369132cc64e6748c2d65cdfb001a2b1c232d128b4ad60561c1"
checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.131"
version = "1.0.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b710a83c4e0dff6a3d511946b95274ad9ca9e5d3ae497b63fda866ac955358d2"
checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
dependencies = [
"proc-macro2",
"quote",
@@ -2576,11 +2471,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.14.0"
version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
dependencies = [
"autocfg 1.0.1",
"bytes",
"libc",
"memchr",
@@ -2591,7 +2485,6 @@ dependencies = [
"pin-project-lite",
"signal-hook-registry",
"tokio-macros",
"tracing",
"winapi",
]
@@ -2607,9 +2500,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
version = "1.6.0"
version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e"
checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
dependencies = [
"proc-macro2",
"quote",
@@ -2911,9 +2804,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "vergen"
version = "5.1.17"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cf88d94e969e7956d924ba70741316796177fa0c79a2c9f4ab04998d96e966e"
checksum = "fd0c9f8387e118573859ae0e6c6fbdfa41bd1f4fbea451b0b8c5a81a3b8bc9e0"
dependencies = [
"anyhow",
"cfg-if",

3
Cargo.toml
View File

@@ -20,7 +20,6 @@ bytes = "1"
bytes-literal = { git = "https://github.com/vorot93/bytes-literal" }
bytesize = "1"
clap = "2"
console-subscriber = { git = "https://github.com/tokio-rs/console" }
croaring = "0.5"
crossterm = { version = "0.22", optional = true }
derive_more = "0.99"
@@ -85,7 +84,7 @@ walkdir = "2"
[build-dependencies]
anyhow = "1"
vergen = "5"
vergen = "6"
[dev-dependencies]
bytes-literal = { git = "https://github.com/vorot93/bytes-literal" }

24
bin/akula-rpc.rs
View File

@@ -4,17 +4,13 @@ use tracing_subscriber::{prelude::*, EnvFilter};
#[derive(StructOpt)]
#[structopt(name = "Akula RPC", about = "RPC server for Akula")]
pub struct Opt {
#[structopt(long, env)]
pub tokio_console: bool,
#[structopt(long, env)]
pub kv_address: String,
}
#[tokio::main]
async fn main() -> anyhow::Result<()> {
let opt = Opt::from_args();
let filter = if std::env::var(EnvFilter::DEFAULT_ENV)
let env_filter = if std::env::var(EnvFilter::DEFAULT_ENV)
.unwrap_or_default()
.is_empty()
{
@@ -22,20 +18,10 @@ async fn main() -> anyhow::Result<()> {
} else {
EnvFilter::from_default_env()
};
let registry = tracing_subscriber::registry()
// the `TasksLayer` can be used in combination with other `tracing` layers...
.with(tracing_subscriber::fmt::layer().with_target(false));
if opt.tokio_console {
let (layer, server) = console_subscriber::TasksLayer::new();
registry
.with(filter.add_directive("tokio=trace".parse()?))
.with(layer)
.init();
tokio::spawn(async move { server.serve().await.expect("server failed") });
} else {
registry.with(filter).init();
}
tracing_subscriber::registry()
.with(tracing_subscriber::fmt::layer().with_target(false))
.with(env_filter)
.init();
Ok(())
}

1
bin/akula-toolbox.rs
View File

@@ -383,7 +383,6 @@ async fn main() -> anyhow::Result<()> {
EnvFilter::from_default_env()
};
tracing_subscriber::registry()
// the `TasksLayer` can be used in combination with other `tracing` layers...
.with(tracing_subscriber::fmt::layer().with_target(false))
.with(filter)
.init();

24
bin/akula.rs
View File

@@ -74,10 +74,6 @@ pub struct Opt {
/// Exit execution stage after batch.
#[structopt(long, env)]
pub execution_exit_after_batch: bool,
/// Enables tokio console server
#[structopt(long, env)]
pub tokio_console: bool,
}
#[derive(Debug)]
@@ -489,7 +485,7 @@ async fn main() -> anyhow::Result<()> {
let opt: Opt = Opt::from_args();
// tracing setup
let filter = if std::env::var(EnvFilter::DEFAULT_ENV)
let env_filter = if std::env::var(EnvFilter::DEFAULT_ENV)
.unwrap_or_default()
.is_empty()
{
@@ -497,20 +493,10 @@ async fn main() -> anyhow::Result<()> {
} else {
EnvFilter::from_default_env()
};
let registry = tracing_subscriber::registry()
// the `TasksLayer` can be used in combination with other `tracing` layers...
.with(tracing_subscriber::fmt::layer().with_target(false));
if opt.tokio_console {
let (layer, server) = console_subscriber::TasksLayer::new();
registry
.with(filter.add_directive("tokio=trace".parse()?))
.with(layer)
.init();
tokio::spawn(async move { server.serve().await.expect("server failed") });
} else {
registry.with(filter).init();
}
tracing_subscriber::registry()
.with(tracing_subscriber::fmt::layer().with_target(false))
.with(env_filter)
.init();
info!("Starting Akula ({})", version_string());

22
bin/consensus-tests.rs
View File

@@ -863,8 +863,6 @@ pub struct Opt {
pub tests: PathBuf,
#[structopt(long, env)]
pub test_names: Vec<String>,
#[structopt(long, env)]
pub tokio_console: bool,
}
#[derive(Debug, Default)]
@@ -909,7 +907,7 @@ fn exclude_test(p: &Path, root: &Path) -> bool {
async fn main() -> anyhow::Result<()> {
let opt = Opt::from_args();
let filter = if std::env::var(EnvFilter::DEFAULT_ENV)
let env_filter = if std::env::var(EnvFilter::DEFAULT_ENV)
.unwrap_or_default()
.is_empty()
{
@@ -917,20 +915,10 @@ async fn main() -> anyhow::Result<()> {
} else {
EnvFilter::from_default_env()
};
let registry = tracing_subscriber::registry()
// the `TasksLayer` can be used in combination with other `tracing` layers...
.with(tracing_subscriber::fmt::layer().with_target(false));
if opt.tokio_console {
let (layer, server) = console_subscriber::TasksLayer::new();
registry
.with(filter.add_directive("tokio=trace".parse()?))
.with(layer)
.init();
tokio::spawn(async move { server.serve().await.expect("server failed") });
} else {
registry.with(filter).init();
}
tracing_subscriber::registry()
.with(tracing_subscriber::fmt::layer().with_target(false))
.with(env_filter)
.init();
let root_dir = opt.tests;
let test_names = opt.test_names.into_iter().collect();