From 2c842e9932c41907d0eea79040757bed1e5bab87 Mon Sep 17 00:00:00 2001 From: Yihau Chen Date: Wed, 29 Mar 2023 11:28:56 +0800 Subject: [PATCH] chore: workspace inheritance (#30939) * client/Cargo.toml * udp-client/Cargo.toml * tpu-client/Cargo.toml * thin-client/Cargo.toml * storage-proto/Cargo.toml * quic-client/Cargo.toml * dos/Cargo.toml * entry/Cargo.toml * perf/Cargo.toml * program-runtime/Cargo.toml * program-test/Cargo.toml * programs/address-lookup-table/Cargo.toml * programs/loader-v3/Cargo.toml * connection-cache/Cargo.toml * programs/sbf/rust/big_mod_exp/Cargo.toml * programs/zk-token-proof-tests/Cargo.toml --- client/Cargo.toml | 12 +++---- connection-cache/Cargo.toml | 44 ++++++++++++------------ dos/Cargo.toml | 12 +++---- entry/Cargo.toml | 12 +++---- perf/Cargo.toml | 12 +++---- program-runtime/Cargo.toml | 12 +++---- program-test/Cargo.toml | 11 +++--- programs/address-lookup-table/Cargo.toml | 12 +++---- programs/loader-v3/Cargo.toml | 12 +++---- programs/sbf/rust/big_mod_exp/Cargo.toml | 22 ++++++------ programs/zk-token-proof-tests/Cargo.toml | 20 +++++------ quic-client/Cargo.toml | 12 +++---- storage-proto/Cargo.toml | 12 +++---- thin-client/Cargo.toml | 12 +++---- tpu-client/Cargo.toml | 12 +++---- udp-client/Cargo.toml | 12 +++---- 16 files changed, 121 insertions(+), 120 deletions(-) diff --git a/client/Cargo.toml b/client/Cargo.toml index 12115d25a4..ffa84ee1d6 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-client" -version = "1.16.0" description = "Solana Client" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-client" -license = "Apache-2.0" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] async-trait = { workspace = true } diff --git a/connection-cache/Cargo.toml b/connection-cache/Cargo.toml index 8faf5a5a91..a70cabbbbc 100644 --- a/connection-cache/Cargo.toml +++ b/connection-cache/Cargo.toml @@ -1,30 +1,30 @@ [package] name = "solana-connection-cache" -version = "1.16.0" description = "Solana Connection Cache" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-connection-cache" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] -async-trait = "0.1.57" -bincode = "1.3.3" -futures-util = "0.3.26" -indexmap = "1.9.2" -indicatif = { version = "0.17.1", optional = true } -log = "0.4.17" -rand = "0.7.0" -rayon = "1.5.3" -solana-measure = { path = "../measure", version = "=1.16.0" } -solana-metrics = { path = "../metrics", version = "=1.16.0" } -solana-sdk = { path = "../sdk", version = "=1.16.0" } -thiserror = "1.0" -tokio = { version = "1", features = ["full"] } +async-trait = { workspace = true } +bincode = { workspace = true } +futures-util = { workspace = true } +indexmap = { workspace = true } +indicatif = { workspace = true, optional = true } +log = { workspace = true } +rand = { workspace = true } +rayon = { workspace = true } +solana-measure = { workspace = true } +solana-metrics = { workspace = true } +solana-sdk = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["full"] } [dev-dependencies] -rand_chacha = "0.2.2" -solana-logger = { path = "../logger", version = "=1.16.0" } -solana-net-utils = { path = "../net-utils", version = "=1.16.0" } +rand_chacha = { workspace = true } +solana-logger = { workspace = true } +solana-net-utils = { workspace = true } diff --git a/dos/Cargo.toml b/dos/Cargo.toml index d100d501c4..179fc40bf8 100644 --- a/dos/Cargo.toml +++ b/dos/Cargo.toml @@ -1,13 +1,13 @@ [package] -authors = ["Solana Labs Maintainers "] -edition = "2021" name = "solana-dos" -version = "1.16.0" -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" publish = false description = "Tool to send various requests to cluster in order to evaluate the effect on performance" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] bincode = { workspace = true } diff --git a/entry/Cargo.toml b/entry/Cargo.toml index bdf9f9fb53..0b3b0776db 100644 --- a/entry/Cargo.toml +++ b/entry/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-entry" -version = "1.16.0" description = "Solana Entry" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-poh" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] bincode = { workspace = true } diff --git a/perf/Cargo.toml b/perf/Cargo.toml index dc123d9f50..4b16cf4a41 100644 --- a/perf/Cargo.toml +++ b/perf/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-perf" -version = "1.16.0" description = "Solana Performance APIs" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-perf" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] ahash = { workspace = true } diff --git a/program-runtime/Cargo.toml b/program-runtime/Cargo.toml index 1da8bd8754..2278bdb631 100644 --- a/program-runtime/Cargo.toml +++ b/program-runtime/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-program-runtime" -version = "1.16.0" description = "Solana program runtime" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-program-runtime" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] base64 = { workspace = true } diff --git a/program-test/Cargo.toml b/program-test/Cargo.toml index 7fc307578f..92ec38af87 100644 --- a/program-test/Cargo.toml +++ b/program-test/Cargo.toml @@ -1,11 +1,12 @@ [package] -authors = ["Solana Labs Maintainers "] description = "Solana Program Test Framework" -edition = "2021" -license = "Apache-2.0" name = "solana-program-test" -repository = "https://github.com/solana-labs/solana" -version = "1.16.0" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] assert_matches = { workspace = true } diff --git a/programs/address-lookup-table/Cargo.toml b/programs/address-lookup-table/Cargo.toml index be2cd2083e..b4cee366dd 100644 --- a/programs/address-lookup-table/Cargo.toml +++ b/programs/address-lookup-table/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-address-lookup-table-program" -version = "1.16.0" description = "Solana address lookup table program" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-address-loookup-table-program" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] bincode = { workspace = true } diff --git a/programs/loader-v3/Cargo.toml b/programs/loader-v3/Cargo.toml index 26bebbbacf..b844c41590 100644 --- a/programs/loader-v3/Cargo.toml +++ b/programs/loader-v3/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-loader-v3-program" -version = "1.16.0" description = "Solana Loader v3" -authors = ["Solana Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solana.com/" -edition = "2021" publish = false +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] log = { workspace = true } diff --git a/programs/sbf/rust/big_mod_exp/Cargo.toml b/programs/sbf/rust/big_mod_exp/Cargo.toml index ecd2ba69cf..783b5c59ee 100644 --- a/programs/sbf/rust/big_mod_exp/Cargo.toml +++ b/programs/sbf/rust/big_mod_exp/Cargo.toml @@ -1,19 +1,19 @@ [package] name = "solana-bpf-rust-big-mod-exp" -version = "1.16.0" -description = "Solana BPF test program written in Rust" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-bpf-rust-big-mod-exp" -edition = "2021" +version = { workspace = true } +description = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] -array-bytes = "=1.4.1" -serde = { version = "1.0.112", features = ["derive"] } -serde_json = "1.0.56" -solana-program = { path = "../../../../sdk/program", version = "=1.16.0" } +array-bytes = { workspace = true } +serde = { workspace = true, features = ["derive"] } +serde_json = { workspace = true } +solana-program = { workspace = true } [lib] crate-type = ["cdylib"] diff --git a/programs/zk-token-proof-tests/Cargo.toml b/programs/zk-token-proof-tests/Cargo.toml index 8ddb5656a7..2a8b994d47 100644 --- a/programs/zk-token-proof-tests/Cargo.toml +++ b/programs/zk-token-proof-tests/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "solana-zk-token-proof-program-tests" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -version = "1.16.0" -license = "Apache-2.0" -edition = "2021" publish = false +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dev-dependencies] -bytemuck = { version = "1.11.0", features = ["derive"] } -solana-program-runtime = { path = "../../program-runtime", version = "=1.16.0" } -solana-program-test = { path = "../../program-test", version = "=1.16.0" } -solana-sdk = { path = "../../sdk", version = "=1.16.0" } -solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=1.16.0" } +bytemuck = { workspace = true, features = ["derive"] } +solana-program-runtime = { workspace = true } +solana-program-test = { workspace = true } +solana-sdk = { workspace = true } +solana-zk-token-sdk = { workspace = true } diff --git a/quic-client/Cargo.toml b/quic-client/Cargo.toml index ed5df13a3f..fa0a6796a7 100644 --- a/quic-client/Cargo.toml +++ b/quic-client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-quic-client" -version = "1.16.0" description = "Solana Quic Client" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-quic-client" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] async-mutex = { workspace = true } diff --git a/storage-proto/Cargo.toml b/storage-proto/Cargo.toml index 819edbf56d..c5658aaa40 100644 --- a/storage-proto/Cargo.toml +++ b/storage-proto/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-storage-proto" -version = "1.16.0" description = "Solana Storage Protobuf Definitions" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-storage-proto" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] bincode = { workspace = true } diff --git a/thin-client/Cargo.toml b/thin-client/Cargo.toml index 6cda9dcdbb..75bdaf1bc1 100644 --- a/thin-client/Cargo.toml +++ b/thin-client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-thin-client" -version = "1.16.0" description = "Solana Thin Client" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-thin-client" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] bincode = { workspace = true } diff --git a/tpu-client/Cargo.toml b/tpu-client/Cargo.toml index 8ee1c3b57b..a23dbce2ec 100644 --- a/tpu-client/Cargo.toml +++ b/tpu-client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-tpu-client" -version = "1.16.0" description = "Solana TPU Client" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-tpu-client" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] async-trait = { workspace = true } diff --git a/udp-client/Cargo.toml b/udp-client/Cargo.toml index 4b22df7426..e285159ff2 100644 --- a/udp-client/Cargo.toml +++ b/udp-client/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "solana-udp-client" -version = "1.16.0" description = "Solana UDP Client" -authors = ["Solana Labs Maintainers "] -repository = "https://github.com/solana-labs/solana" -license = "Apache-2.0" -homepage = "https://solanalabs.com/" documentation = "https://docs.rs/solana-udp-client" -edition = "2021" +version = { workspace = true } +authors = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +license = { workspace = true } +edition = { workspace = true } [dependencies] async-trait = { workspace = true }