gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move binaries from src/bin into their own crate

Browse Source
This commit is contained in:
Michael Vines
2018-12-13 21:11:09 -08:00
parent 092edabd2d
commit 0fe6d61036
19 changed files with 234 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
Cargo.lock generated
View File

@ -1778,6 +1778,27 @@ dependencies = [
"untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "solana-bench-streamer"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
]
[[package]]
name = "solana-bench-tps"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
"solana-drone 0.11.0",
"solana-metrics 0.11.0",
"solana-sdk 0.11.0",
]
[[package]] [[package]]
name = "solana-bpf-noop" name = "solana-bpf-noop"
version = "0.11.0" version = "0.11.0"
@ -1845,7 +1866,7 @@ dependencies = [
[[package]] [[package]]
name = "solana-fullnode" name = "solana-fullnode"
version = "0.1.0" version = "0.11.0"
dependencies = [ dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1857,6 +1878,28 @@ dependencies = [
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
[[package]]
name = "solana-fullnode-config"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
"solana-sdk 0.11.0",
]
[[package]]
name = "solana-genesis"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
"solana-sdk 0.11.0",
]
[[package]] [[package]]
name = "solana-jsonrpc-core" name = "solana-jsonrpc-core"
version = "0.3.0" version = "0.3.0"
@ -2002,6 +2045,15 @@ dependencies = [
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
[[package]]
name = "solana-ledger-tool"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
]
[[package]] [[package]]
name = "solana-lualoader" name = "solana-lualoader"
version = "0.11.0" version = "0.11.0"
@ -2045,6 +2097,17 @@ dependencies = [
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
[[package]]
name = "solana-replicator"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
"solana-sdk 0.11.0",
]
[[package]] [[package]]
name = "solana-sdk" name = "solana-sdk"
version = "0.11.0" version = "0.11.0"
@ -2124,6 +2187,17 @@ dependencies = [
"solana-sdk 0.11.0", "solana-sdk 0.11.0",
] ]
[[package]]
name = "solana-wallet"
version = "0.11.0"
dependencies = [
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.11.0",
"solana-sdk 0.11.0",
]
[[package]] [[package]]
name = "solana-ws" name = "solana-ws"
version = "0.2.0" version = "0.2.0"

41
Cargo.toml
View File

@ -10,36 +10,6 @@ authors = ["Solana Maintainers <maintainers@solana.com>"]
license = "Apache-2.0" license = "Apache-2.0"
edition = "2018" edition = "2018"
[[bin]]
required-features = ["bench_streamer"]
name = "solana-bench-streamer"
path = "src/bin/bench-streamer.rs"
[[bin]]
name = "solana-bench-tps"
path = "src/bin/bench-tps.rs"
[[bin]]
required-features = ["chacha"]
name = "solana-replicator"
path = "src/bin/replicator.rs"
[[bin]]
name = "solana-fullnode-config"
path = "src/bin/fullnode-config.rs"
[[bin]]
name = "solana-genesis"
path = "src/bin/genesis.rs"
[[bin]]
name = "solana-ledger-tool"
path = "src/bin/ledger-tool.rs"
[[bin]]
name = "solana-wallet"
path = "src/bin/wallet.rs"
[badges] [badges]
codecov = { repository = "solana-labs/solana", branch = "master", service = "github" } codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
@ -133,10 +103,15 @@ name = "chacha"
[workspace] [workspace]
members = [ members = [
".", ".",
"bench-streamer",
"bench-tps",
"drone", "drone",
"keygen",
"metrics",
"fullnode", "fullnode",
"fullnode-config",
"genesis",
"keygen",
"ledger-tool",
"metrics",
"programs/bpf/rust/noop", "programs/bpf/rust/noop",
"programs/native/bpf_loader", "programs/native/bpf_loader",
"programs/native/budget", "programs/native/budget",
@ -145,7 +120,9 @@ members = [
"programs/native/native_loader", "programs/native/native_loader",
"programs/native/noop", "programs/native/noop",
"programs/native/vote", "programs/native/vote",
"replicator",
"sdk", "sdk",
"upload-perf", "upload-perf",
"vote-signer", "vote-signer",
"wallet",
] ]

15
bench-streamer/Cargo.toml Normal file
View File

@ -0,0 +1,15 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-bench-streamer"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
solana = { path = "..", version = "0.11.0" }
[features]
cuda = []

0
src/bin/bench-streamer.rs → bench-streamer/src/main.rs
View File

20
bench-tps/Cargo.toml Normal file
View File

@ -0,0 +1,20 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-bench-tps"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
rayon = "1.0.3"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-drone = { path = "../drone", version = "0.11.0" }
solana-metrics = { path = "../metrics", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }
[features]
cuda = []

0
src/bin/bench-tps.rs → bench-tps/src/main.rs
View File

3
ci/publish-crate.sh
View File

@ -18,6 +18,9 @@ CRATES=(
programs/native/{budget,bpf_loader,lua_loader,native_loader,noop,system,vote} programs/native/{budget,bpf_loader,lua_loader,native_loader,noop,system,vote}
. .
fullnode fullnode
genesis
ledger-tool
wallet
) )

19
fullnode-config/Cargo.toml Normal file
View File

@ -0,0 +1,19 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-fullnode-config"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
dirs = "1.0.2"
log = "0.4.2"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }
[features]
cuda = []

0
src/bin/fullnode-config.rs → fullnode-config/src/main.rs
View File

4
fullnode/Cargo.toml
View File

@ -2,7 +2,7 @@
authors = ["Solana Maintainers <maintainers@solana.com>"] authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018" edition = "2018"
name = "solana-fullnode" name = "solana-fullnode"
version = "0.1.0" version = "0.11.0"
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0" license = "Apache-2.0"
homepage = "https://solana.com/" homepage = "https://solana.com/"
@ -19,7 +19,7 @@ solana-sdk = { path = "../sdk", version = "0.11.0" }
[features] [features]
chacha = [] chacha = []
cuda = [] cuda = ["solana/cuda"]
erasure = [] erasure = []
ipv6 = [] ipv6 = []
unstable = [] unstable = []

17
genesis/Cargo.toml Normal file
View File

@ -0,0 +1,17 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-genesis"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }
[features]
cuda = []

0
src/bin/genesis.rs → genesis/src/main.rs
View File

16
ledger-tool/Cargo.toml Normal file
View File

@ -0,0 +1,16 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-ledger-tool"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
[features]
cuda = []

0
src/bin/ledger-tool.rs → ledger-tool/src/main.rs
View File

19
replicator/Cargo.toml Normal file
View File

@ -0,0 +1,19 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-replicator"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
dirs = "1.0.2"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }
[features]
chacha = ["solana/chacha"]
cuda = ["solana/cuda"]

0
src/bin/replicator.rs → replicator/src/main.rs
View File

24
scripts/cargo-install-all.sh
View File

@ -5,8 +5,24 @@
set -e set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
SECONDS=0
CRATES=(
drone
keygen
fullnode
bench-streamer
bench-tps
fullnode-config
genesis
ledger-tool
wallet
)
for crate in "${CRATES[@]}"; do
(
set -x set -x
cargo install --path drone "$@" cargo install --path "$crate" "$@"
cargo install --path keygen "$@" )
cargo install --path . "$@" done
cargo install --path fullnode "$@"
echo "Done after $SECONDS seconds"

18
wallet/Cargo.toml Normal file
View File

@ -0,0 +1,18 @@
[package]
authors = ["Solana Maintainers <maintainers@solana.com>"]
edition = "2018"
name = "solana-wallet"
version = "0.11.0"
repository = "https://github.com/solana-labs/solana"
license = "Apache-2.0"
homepage = "https://solana.com/"
[dependencies]
clap = "2.32.0"
dirs = "1.0.2"
serde_json = "1.0.10"
solana = { path = "..", version = "0.11.0" }
solana-sdk = { path = "../sdk", version = "0.11.0" }
[features]
cuda = []

0
src/bin/wallet.rs → wallet/src/main.rs
View File