project-serum
/
solana
mirror of https://github.com/project-serum/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move src/ into core/src. Top-level crate is now called solana-workspace

This commit is contained in:
Michael Vines 2019-03-01 19:00:43 -08:00
parent 7b849b042c
commit 5f5d779ee1
79 changed files with 106 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
/target/ /target/
/ledger-tool/target/ /ledger-tool/target/
/wallet/target/ /wallet/target/
/core/target/
/book/html/ /book/html/
/book/src/img/ /book/src/img/
/book/src/tests.ok /book/src/tests.ok

20
Cargo.lock generated
View File

@ -2377,6 +2377,26 @@ dependencies = [
"solana-vote-signer 0.12.0", "solana-vote-signer 0.12.0",
] ]
[[package]]
name = "solana-workspace"
version = "0.12.0"
dependencies = [
"bincode 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hashbrown 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)",
"serde_json 1.0.39 (registry+https://github.com/rust-lang/crates.io-index)",
"solana 0.12.0",
"solana-logger 0.12.0",
"solana-netutil 0.12.0",
"solana-runtime 0.12.0",
"solana-sdk 0.12.0",
"sys-info 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "solana_rbpf" name = "solana_rbpf"
version = "0.1.10" version = "0.1.10"

46
Cargo.toml
View File

@ -1,5 +1,5 @@
[package] [package]
name = "solana" name = "solana-workspace"
description = "Blockchain, Rebuilt for Scale" description = "Blockchain, Rebuilt for Scale"
version = "0.12.0" version = "0.12.0"
documentation = "https://docs.rs/solana" documentation = "https://docs.rs/solana"
@ -14,55 +14,28 @@ edition = "2018"
codecov = { repository = "solana-labs/solana", branch = "master", service = "github" } codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
[features] [features]
chacha = [] chacha = ["solana/chacha"]
cuda = [] cuda = ["solana/cuda"]
erasure = [] erasure = ["solana/erasure"]
ipv6 = ["solana-netutil/ipv6"] ipv6 = ["solana/ipv6", "solana-netutil/ipv6"]
test = [] test = ["solana/test"]
unstable = [] unstable = ["solana/unstable"]
[dependencies] [dev-dependencies]
bincode = "1.1.2" bincode = "1.1.2"
bs58 = "0.2.0" bs58 = "0.2.0"
byteorder = "1.3.1"
chrono = { version = "0.4.0", features = ["serde"] }
hashbrown = "0.1.8" hashbrown = "0.1.8"
indexmap = "1.0"
itertools = "0.8.0"
jsonrpc-core = "10.1.0"
jsonrpc-derive = "10.1.0"
jsonrpc-http-server = "10.1.0"
jsonrpc-pubsub = "10.1.0"
jsonrpc-ws-server = "10.1.0"
libc = "0.2.49"
log = "0.4.2" log = "0.4.2"
nix = "0.13.0"
rand = "0.6.5" rand = "0.6.5"
rand_chacha = "0.1.1"
rayon = "1.0.0" rayon = "1.0.0"
reqwest = "0.9.10" reqwest = "0.9.10"
ring = "0.13.2"
rocksdb = "0.11.0"
serde = "1.0.89"
serde_derive = "1.0.89"
serde_json = "1.0.39" serde_json = "1.0.39"
solana-drone = { path = "drone", version = "0.12.0" } solana = { path = "core", version = "0.12.0" }
solana-logger = { path = "logger", version = "0.12.0" } solana-logger = { path = "logger", version = "0.12.0" }
solana-metrics = { path = "metrics", version = "0.12.0" }
solana-netutil = { path = "netutil", version = "0.12.0" } solana-netutil = { path = "netutil", version = "0.12.0" }
solana-runtime = { path = "runtime", version = "0.12.0" } solana-runtime = { path = "runtime", version = "0.12.0" }
solana-sdk = { path = "sdk", version = "0.12.0" } solana-sdk = { path = "sdk", version = "0.12.0" }
solana-vote-signer = { path = "vote-signer", version = "0.12.0" }
sys-info = "0.5.6" sys-info = "0.5.6"
tokio = "0.1"
tokio-codec = "0.1"
untrusted = "0.6.2"
[dev-dependencies]
hex-literal = "0.1.3"
matches = "0.1.6"
solana-vote-program = { path = "programs/native/vote", version = "0.12.0" }
solana-budget-program = { path = "programs/native/budget", version = "0.12.0" }
[[bench]] [[bench]]
name = "banking_stage" name = "banking_stage"
@ -88,6 +61,7 @@ members = [
".", ".",
"bench-streamer", "bench-streamer",
"bench-tps", "bench-tps",
"core",
"drone", "drone",
"fullnode", "fullnode",
"fullnode-config", "fullnode-config",

2
bench-streamer/Cargo.toml
View File

@ -9,7 +9,7 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-netutil = { path = "../netutil", version = "0.12.0" } solana-netutil = { path = "../netutil", version = "0.12.0" }

2
bench-tps/Cargo.toml
View File

@ -11,7 +11,7 @@ homepage = "https://solana.com/"
clap = "2.32.0" clap = "2.32.0"
rayon = "1.0.3" rayon = "1.0.3"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-drone = { path = "../drone", version = "0.12.0" } solana-drone = { path = "../drone", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-metrics = { path = "../metrics", version = "0.12.0" } solana-metrics = { path = "../metrics", version = "0.12.0" }

2
ci/publish-crate.sh
View File

@ -18,7 +18,7 @@ CRATES=(
metrics metrics
drone drone
programs/native/{budget,bpf_loader,native_loader,noop,system,vote} programs/native/{budget,bpf_loader,native_loader,noop,system,vote}
. core
fullnode-config fullnode-config
fullnode fullnode
genesis genesis

66
core/Cargo.toml Normal file
View File

@ -0,0 +1,66 @@
[package]
name = "solana"
description = "Blockchain, Rebuilt for Scale"
version = "0.12.0"
documentation = "https://docs.rs/solana"
homepage = "https://solana.com/"
readme = "README.md"
repository = "https://github.com/solana-labs/solana"
authors = ["Solana Maintainers <maintainers@solana.com>"]
license = "Apache-2.0"
edition = "2018"
[badges]
codecov = { repository = "solana-labs/solana", branch = "master", service = "github" }
[features]
chacha = []
cuda = []
erasure = []
ipv6 = ["solana-netutil/ipv6"]
test = []
unstable = []
[dependencies]
bincode = "1.1.2"
bs58 = "0.2.0"
byteorder = "1.3.1"
chrono = { version = "0.4.0", features = ["serde"] }
hashbrown = "0.1.8"
indexmap = "1.0"
itertools = "0.8.0"
jsonrpc-core = "10.1.0"
jsonrpc-derive = "10.1.0"
jsonrpc-http-server = "10.1.0"
jsonrpc-pubsub = "10.1.0"
jsonrpc-ws-server = "10.1.0"
libc = "0.2.49"
log = "0.4.2"
nix = "0.13.0"
rand = "0.6.5"
rand_chacha = "0.1.1"
rayon = "1.0.0"
reqwest = "0.9.10"
ring = "0.13.2"
rocksdb = "0.11.0"
serde = "1.0.89"
serde_derive = "1.0.88"
serde_json = "1.0.39"
solana-drone = { path = "../drone", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" }
solana-metrics = { path = "../metrics", version = "0.12.0" }
solana-netutil = { path = "../netutil", version = "0.12.0" }
solana-runtime = { path = "../runtime", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" }
solana-vote-signer = { path = "../vote-signer", version = "0.12.0" }
sys-info = "0.5.6"
tokio = "0.1"
tokio-codec = "0.1"
untrusted = "0.6.2"
[dev-dependencies]
hex-literal = "0.1.3"
matches = "0.1.6"
solana-vote-program = { path = "../programs/native/vote", version = "0.12.0" }
solana-budget-program = { path = "../programs/native/budget", version = "0.12.0" }

0
src/bank_forks.rs → core/src/bank_forks.rs
View File

0
src/banking_stage.rs → core/src/banking_stage.rs
View File

0
src/blob_fetch_stage.rs → core/src/blob_fetch_stage.rs
View File

0
src/blockstream.rs → core/src/blockstream.rs
View File

0
src/blockstream_service.rs → core/src/blockstream_service.rs
View File

0
src/blocktree.rs → core/src/blocktree.rs
View File

0
src/blocktree_processor.rs → core/src/blocktree_processor.rs
View File

0
src/broadcast_stage.rs → core/src/broadcast_stage.rs
View File

0
src/chacha.rs → core/src/chacha.rs
View File

0
src/chacha_cuda.rs → core/src/chacha_cuda.rs
View File

0
src/client.rs → core/src/client.rs
View File

0
src/cluster_info.rs → core/src/cluster_info.rs
View File

0
src/cluster_info_vote_listener.rs → core/src/cluster_info_vote_listener.rs
View File

0
src/cluster_tests.rs → core/src/cluster_tests.rs
View File

0
src/contact_info.rs → core/src/contact_info.rs
View File

0
src/crds.rs → core/src/crds.rs
View File

0
src/crds_gossip.rs → core/src/crds_gossip.rs
View File

0
src/crds_gossip_error.rs → core/src/crds_gossip_error.rs
View File

0
src/crds_gossip_pull.rs → core/src/crds_gossip_pull.rs
View File

0
src/crds_gossip_push.rs → core/src/crds_gossip_push.rs
View File

0
src/crds_value.rs → core/src/crds_value.rs
View File

0
src/db_window.rs → core/src/db_window.rs
View File

0
src/entry.rs → core/src/entry.rs
View File

0
src/erasure.rs → core/src/erasure.rs
View File

0
src/fetch_stage.rs → core/src/fetch_stage.rs
View File

0
src/fullnode.rs → core/src/fullnode.rs
View File

0
src/gen_keys.rs → core/src/gen_keys.rs
View File

0
src/gossip_service.rs → core/src/gossip_service.rs
View File

0
src/leader_confirmation_service.rs → core/src/leader_confirmation_service.rs
View File

0
src/leader_schedule.rs → core/src/leader_schedule.rs
View File

0
src/leader_schedule_utils.rs → core/src/leader_schedule_utils.rs
View File

0
src/lib.rs → core/src/lib.rs
View File

0
src/local_cluster.rs → core/src/local_cluster.rs
View File

0
src/local_vote_signer_service.rs → core/src/local_vote_signer_service.rs
View File

0
src/packet.rs → core/src/packet.rs
View File

0
src/poh.rs → core/src/poh.rs
View File

0
src/poh_recorder.rs → core/src/poh_recorder.rs
View File

0
src/poh_service.rs → core/src/poh_service.rs
View File

0
src/recvmmsg.rs → core/src/recvmmsg.rs
View File

0
src/repair_service.rs → core/src/repair_service.rs
View File

0
src/replay_stage.rs → core/src/replay_stage.rs
View File

0
src/replicator.rs → core/src/replicator.rs
View File

0
src/result.rs → core/src/result.rs
View File

0
src/retransmit_stage.rs → core/src/retransmit_stage.rs
View File

0
src/rpc.rs → core/src/rpc.rs
View File

0
src/rpc_mock.rs → core/src/rpc_mock.rs
View File

0
src/rpc_pubsub.rs → core/src/rpc_pubsub.rs
View File

0
src/rpc_pubsub_service.rs → core/src/rpc_pubsub_service.rs
View File

0
src/rpc_request.rs → core/src/rpc_request.rs
View File

0
src/rpc_service.rs → core/src/rpc_service.rs
View File

0
src/rpc_status.rs → core/src/rpc_status.rs
View File

0
src/rpc_subscriptions.rs → core/src/rpc_subscriptions.rs
View File

0
src/service.rs → core/src/service.rs
View File

0
src/sigverify.rs → core/src/sigverify.rs
View File

0
src/sigverify_stage.rs → core/src/sigverify_stage.rs
View File

0
src/staking_utils.rs → core/src/staking_utils.rs
View File

0
src/storage_stage.rs → core/src/storage_stage.rs
View File

0
src/streamer.rs → core/src/streamer.rs
View File

0
src/test_tx.rs → core/src/test_tx.rs
View File

0
src/thin_client.rs → core/src/thin_client.rs
View File

0
src/tpu.rs → core/src/tpu.rs
View File

0
src/tpu_forwarder.rs → core/src/tpu_forwarder.rs
View File

0
src/tvu.rs → core/src/tvu.rs
View File

0
src/voting_keypair.rs → core/src/voting_keypair.rs
View File

0
src/window.rs → core/src/window.rs
View File

0
src/window_service.rs → core/src/window_service.rs
View File

2
fullnode/Cargo.toml
View File

@ -12,7 +12,7 @@ homepage = "https://solana.com/"
clap = "2.32.0" clap = "2.32.0"
log = "0.4.2" log = "0.4.2"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-drone = { path = "../drone", version = "0.12.0" } solana-drone = { path = "../drone", version = "0.12.0" }
solana-fullnode-config = { path = "../fullnode-config", version = "0.12.0" } solana-fullnode-config = { path = "../fullnode-config", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }

2
genesis/Cargo.toml
View File

@ -11,7 +11,7 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" }
[features] [features]

2
ledger-tool/Cargo.toml
View File

@ -11,7 +11,7 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-runtime = { path = "../runtime", version = "0.12.0" } solana-runtime = { path = "../runtime", version = "0.12.0" }

2
programs/Cargo.toml
View File

@ -18,7 +18,7 @@ cuda = ["solana/cuda"]
erasure = ["solana/erasure"] erasure = ["solana/erasure"]
[dependencies] [dependencies]
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-bpfloader = { path = "native/bpf_loader", version = "0.12.0" } solana-bpfloader = { path = "native/bpf_loader", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-native-loader = { path = "native/native_loader", version = "0.12.0" } solana-native-loader = { path = "native/native_loader", version = "0.12.0" }

2
replicator/Cargo.toml
View File

@ -10,7 +10,7 @@ homepage = "https://solana.com/"
[dependencies] [dependencies]
clap = "2.32.0" clap = "2.32.0"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-fullnode-config = { path = "../fullnode-config", version = "0.12.0" } solana-fullnode-config = { path = "../fullnode-config", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" }

2
wallet/Cargo.toml
View File

@ -16,7 +16,7 @@ chrono = { version = "0.4.0", features = ["serde"] }
dirs = "1.0.5" dirs = "1.0.5"
log = "0.4.2" log = "0.4.2"
serde_json = "1.0.39" serde_json = "1.0.39"
solana = { path = "..", version = "0.12.0" } solana = { path = "../core", version = "0.12.0" }
solana-drone = { path = "../drone", version = "0.12.0" } solana-drone = { path = "../drone", version = "0.12.0" }
solana-logger = { path = "../logger", version = "0.12.0" } solana-logger = { path = "../logger", version = "0.12.0" }
solana-sdk = { path = "../sdk", version = "0.12.0" } solana-sdk = { path = "../sdk", version = "0.12.0" }