Skip to content

Commit

Permalink
[network] Remove socket bench
Browse files Browse the repository at this point in the history
gregnazario authored and aptos-bot committed Mar 7, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 631786c commit cc63fe4
Showing 11 changed files with 1,152 additions and 1,830 deletions.
2,045 changes: 1,091 additions & 954 deletions Cargo.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -81,7 +81,6 @@ members = [
"network/discovery",
"network/memsocket",
"network/netcore",
"network/socket-bench-server",
"sdk",
"sdk/offchain",
"sdk/transaction-builder",
2 changes: 1 addition & 1 deletion crates/aptos-crypto/src/unit_tests/ed25519_test.rs
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ use core::{
convert::TryFrom,
ops::{Add, Index, IndexMut, Mul, Neg},
};
use ed25519_dalek::ed25519::signature::{Signature as _, Verifier as _};
use ed25519_dalek::ed25519::signature::Verifier as _;

use aptos_crypto_derive::{BCSCryptoHash, CryptoHasher};
use digest::Digest;
118 changes: 60 additions & 58 deletions crates/aptos-workspace-hack/Cargo.toml
Original file line number Diff line number Diff line change
@@ -12,96 +12,98 @@ edition = "2018"
### BEGIN HAKARI SECTION
[dependencies]
Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
anyhow = { version = "1.0.52", features = ["backtrace", "std"] }
backtrace = { version = "0.3.56", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
bitvec = { version = "0.19.5", features = ["alloc", "atomic", "std"] }
anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
byteorder = { version = "1.4.3", features = ["i128", "std"] }
bytes = { version = "1.0.1", features = ["serde", "std"] }
bytes = { version = "1.1.0", features = ["serde", "std"] }
chrono = { version = "0.4.19", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
crossbeam-channel = { version = "0.5.1", features = ["crossbeam-utils", "std"] }
clap = { version = "2.34.0", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
crossbeam-channel = { version = "0.5.2", features = ["crossbeam-utils", "std"] }
crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
crossbeam-queue = { version = "0.3.1", features = ["alloc", "std"] }
crossbeam-utils = { version = "0.8.3", features = ["lazy_static", "std"] }
crossbeam-queue = { version = "0.3.4", features = ["alloc", "std"] }
crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] }
either = { version = "1.6.1", features = ["use_std"] }
futures-channel = { version = "0.3.21", features = ["alloc", "futures-sink", "sink", "std"] }
futures-core = { version = "0.3.21", features = ["alloc", "std"] }
futures-io = { version = "0.3.16", features = ["std"] }
futures-io = { version = "0.3.21", features = ["std"] }
futures-sink = { version = "0.3.21", features = ["alloc", "std"] }
futures-util = { version = "0.3.16", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
hyper = { version = "0.14.11", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1.7.0", default-features = false, features = ["std"] }
itertools = { version = "0.10.1", features = ["use_alloc", "use_std"] }
libc = { version = "0.2.112", features = ["std"] }
futures-util = { version = "0.3.17", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
hyper = { version = "0.14.17", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1.8.0", default-features = false, features = ["std"] }
itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
libc = { version = "0.2.119", features = ["std"] }
log = { version = "0.4.14", default-features = false, features = ["serde", "std"] }
memchr = { version = "2.4.0", features = ["std", "use_std"] }
memchr = { version = "2.4.1", features = ["std", "use_std"] }
num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] }
num-traits = { version = "0.2.14", features = ["i128", "std"] }
plotters = { version = "0.3.0", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
parking_lot = { version = "0.12.0", features = ["send_guard"] }
phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
regex = { version = "1.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
regex-automata = { version = "0.1.9", features = ["regex-syntax", "std"] }
reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] }
regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
reqwest = { version = "0.11.9", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
serde = { version = "1.0.130", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
serde_json = { version = "1.0.73", features = ["indexmap", "preserve_order", "std"] }
sha-1 = { version = "0.9.4", features = ["std"] }
standback = { version = "0.2.15", default-features = false, features = ["std"] }
subtle = { version = "2.4.0", default-features = false, features = ["std"] }
tiny-keccak = { version = "2.0.2", features = ["sha3"] }
tokio = { version = "1.9.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
tokio-util = { version = "0.6.7", features = ["codec", "compat", "futures-io", "io"] }
serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
serde_json = { version = "1.0.79", features = ["indexmap", "preserve_order", "std"] }
sha-1 = { version = "0.9.8", features = ["std"] }
standback = { version = "0.2.17", default-features = false, features = ["std"] }
subtle = { version = "2.4.1", default-features = false, features = ["std"] }
tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "winapi"] }
tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
toml = { version = "0.5.8" }
tracing = { version = "0.1.26", features = ["attributes", "log", "std", "tracing-attributes"] }
tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
zeroize = { version = "1.2.0", features = ["alloc", "zeroize_derive"] }
zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }

[build-dependencies]
Inflector = { version = "0.11.4", features = ["heavyweight", "lazy_static", "regex"] }
anyhow = { version = "1.0.52", features = ["backtrace", "std"] }
backtrace = { version = "0.3.56", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
bitvec = { version = "0.19.5", features = ["alloc", "atomic", "std"] }
anyhow = { version = "1.0.56", features = ["backtrace", "std"] }
backtrace = { version = "0.3.58", features = ["addr2line", "gimli-symbolize", "miniz_oxide", "object", "serde", "std"] }
byteorder = { version = "1.4.3", features = ["i128", "std"] }
bytes = { version = "1.0.1", features = ["serde", "std"] }
cc = { version = "1.0.67", default-features = false, features = ["jobserver", "parallel"] }
bytes = { version = "1.1.0", features = ["serde", "std"] }
cc = { version = "1.0.73", default-features = false, features = ["jobserver", "parallel"] }
chrono = { version = "0.4.19", features = ["clock", "libc", "oldtime", "serde", "std", "time", "winapi"] }
clap = { version = "2.33.3", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
crossbeam-channel = { version = "0.5.1", features = ["crossbeam-utils", "std"] }
clap = { version = "2.34.0", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
crossbeam-channel = { version = "0.5.2", features = ["crossbeam-utils", "std"] }
crossbeam-deque = { version = "0.8.1", features = ["crossbeam-epoch", "crossbeam-utils", "std"] }
crossbeam-queue = { version = "0.3.1", features = ["alloc", "std"] }
crossbeam-utils = { version = "0.8.3", features = ["lazy_static", "std"] }
crossbeam-queue = { version = "0.3.4", features = ["alloc", "std"] }
crossbeam-utils = { version = "0.8.7", features = ["lazy_static", "std"] }
either = { version = "1.6.1", features = ["use_std"] }
futures-channel = { version = "0.3.21", features = ["alloc", "futures-sink", "sink", "std"] }
futures-core = { version = "0.3.21", features = ["alloc", "std"] }
futures-io = { version = "0.3.16", features = ["std"] }
futures-io = { version = "0.3.21", features = ["std"] }
futures-sink = { version = "0.3.21", features = ["alloc", "std"] }
futures-util = { version = "0.3.16", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
hyper = { version = "0.14.11", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1.7.0", default-features = false, features = ["std"] }
itertools = { version = "0.10.1", features = ["use_alloc", "use_std"] }
libc = { version = "0.2.112", features = ["std"] }
futures-util = { version = "0.3.17", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "proc-macro-hack", "proc-macro-nested", "sink", "slab", "std"] }
generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
hyper = { version = "0.14.17", features = ["client", "full", "h2", "http1", "http2", "runtime", "server", "socket2", "stream", "tcp"] }
indexmap = { version = "1.8.0", default-features = false, features = ["std"] }
itertools = { version = "0.10.3", features = ["use_alloc", "use_std"] }
libc = { version = "0.2.119", features = ["std"] }
log = { version = "0.4.14", default-features = false, features = ["serde", "std"] }
memchr = { version = "2.4.0", features = ["std", "use_std"] }
memchr = { version = "2.4.1", features = ["std", "use_std"] }
num-integer = { version = "0.1.44", default-features = false, features = ["i128", "std"] }
num-traits = { version = "0.2.14", features = ["i128", "std"] }
plotters = { version = "0.3.0", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
parking_lot = { version = "0.12.0", features = ["send_guard"] }
phf_shared = { version = "0.10.0", features = ["std", "uncased"] }
plotters = { version = "0.3.1", default-features = false, features = ["area_series", "evcxr", "histogram", "line_series", "plotters-svg", "svg_backend"] }
rand = { version = "0.8.4", features = ["alloc", "getrandom", "libc", "rand_chacha", "rand_hc", "small_rng", "std", "std_rng"] }
regex = { version = "1.4.3", features = ["aho-corasick", "memchr", "perf", "perf-cache", "perf-dfa", "perf-inline", "perf-literal", "std", "thread_local", "unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
regex-automata = { version = "0.1.9", features = ["regex-syntax", "std"] }
reqwest = { version = "0.11.2", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls"] }
regex-automata = { version = "0.1.10", features = ["regex-syntax", "std"] }
reqwest = { version = "0.11.9", features = ["__tls", "blocking", "default-tls", "hyper-tls", "json", "native-tls-crate", "serde_json", "stream", "tokio-native-tls", "tokio-util"] }
rusty-fork = { version = "0.3.0", features = ["timeout", "wait-timeout"] }
serde = { version = "1.0.130", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
serde_json = { version = "1.0.73", features = ["indexmap", "preserve_order", "std"] }
sha-1 = { version = "0.9.4", features = ["std"] }
standback = { version = "0.2.15", default-features = false, features = ["std"] }
subtle = { version = "2.4.0", default-features = false, features = ["std"] }
syn = { version = "1.0.74", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
tiny-keccak = { version = "2.0.2", features = ["sha3"] }
tokio = { version = "1.9.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "sync", "test-util", "time", "tokio-macros", "winapi"] }
tokio-util = { version = "0.6.7", features = ["codec", "compat", "futures-io", "io"] }
serde = { version = "1.0.136", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
serde_json = { version = "1.0.79", features = ["indexmap", "preserve_order", "std"] }
sha-1 = { version = "0.9.8", features = ["std"] }
standback = { version = "0.2.17", default-features = false, features = ["std"] }
subtle = { version = "2.4.1", default-features = false, features = ["std"] }
syn = { version = "1.0.86", features = ["clone-impls", "derive", "extra-traits", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
tokio = { version = "1.17.0", features = ["bytes", "fs", "full", "io-std", "io-util", "libc", "macros", "memchr", "mio", "net", "num_cpus", "once_cell", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "signal-hook-registry", "socket2", "sync", "test-util", "time", "tokio-macros", "winapi"] }
tokio-util = { version = "0.6.9", features = ["codec", "compat", "futures-io", "io"] }
toml = { version = "0.5.8" }
tracing = { version = "0.1.26", features = ["attributes", "log", "std", "tracing-attributes"] }
tracing = { version = "0.1.31", features = ["attributes", "log", "std", "tracing-attributes"] }
warp = { version = "0.3.2", features = ["multipart", "tls", "tokio-rustls", "tokio-tungstenite", "websocket"] }
zeroize = { version = "1.2.0", features = ["alloc", "zeroize_derive"] }
zeroize = { version = "1.5.3", features = ["alloc", "zeroize_derive"] }

### END HAKARI SECTION
9 changes: 0 additions & 9 deletions network/Cargo.toml
Original file line number Diff line number Diff line change
@@ -63,17 +63,8 @@ proptest = { version = "1.0.0", default-features = true }
proptest-derive = { version = "0.3.0" }
rand_core = "0.6.2"
serial_test = "0.5.1"
socket-bench-server = { path = "./socket-bench-server" }

[features]
default = []
fuzzing = ["bitvec/fuzzing", "aptos-config/fuzzing", "aptos-crypto/fuzzing", "aptos-types/fuzzing", "aptos-proptest-helpers", "aptos-time-service/testing", "aptos-types/fuzzing", "memsocket/testing", "netcore/fuzzing", "proptest", "proptest-derive", "rand_core"]
testing = ["aptos-config/testing", "aptos-time-service/testing", "memsocket/testing", "netcore/testing"]

[[bench]]
name = "socket_bench"
harness = false

[[bench]]
name = "network_bench"
harness = false
147 changes: 0 additions & 147 deletions network/benches/network_bench.rs

This file was deleted.

410 changes: 0 additions & 410 deletions network/benches/socket_bench.rs

This file was deleted.

26 changes: 0 additions & 26 deletions network/socket-bench-server/Cargo.toml

This file was deleted.

177 changes: 0 additions & 177 deletions network/socket-bench-server/src/lib.rs

This file was deleted.

46 changes: 0 additions & 46 deletions network/socket-bench-server/src/main.rs

This file was deleted.

1 change: 0 additions & 1 deletion x.toml
Original file line number Diff line number Diff line change
@@ -188,7 +188,6 @@ members = [
"memsocket",
"offchain",
"smoke-test",
"socket-bench-server",
"transaction-emitter",
"x",
"x-core",

0 comments on commit cc63fe4

Please sign in to comment.