From 92d485dd4de760ca4748edeb15f3dcfe47ad3941 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 29 Nov 2019 13:50:32 -0700 Subject: [PATCH] Cleanup (#7176) * Drop serde error instances These were no longer needed after ToPrimitive instances were added. * Rename last of _api crates --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- bench-tps/Cargo.toml | 4 ++-- bench-tps/src/bench.rs | 4 ++-- book/src/cluster/stake-delegation-and-rewards.md | 2 +- ci/test-stable.sh | 4 ++-- programs/btc_spv/src/header_store.rs | 2 +- programs/btc_spv/src/spv_state.rs | 2 +- programs/btc_spv/src/utils.rs | 2 +- programs/budget/src/budget_instruction.rs | 2 +- programs/{librapay_api => librapay}/.gitignore | 0 programs/{librapay_api => librapay}/Cargo.lock | 0 programs/{librapay_api => librapay}/Cargo.toml | 6 +++--- programs/{librapay_api => librapay}/src/lib.rs | 0 .../src/librapay_instruction.rs | 0 .../src/librapay_transaction.rs | 0 programs/{ownable_api => ownable}/Cargo.toml | 8 ++++---- programs/{ownable_api => ownable}/src/lib.rs | 0 .../{ownable_api => ownable}/src/ownable_instruction.rs | 3 +-- .../{ownable_api => ownable}/src/ownable_processor.rs | 0 programs/stake/src/stake_instruction.rs | 2 +- programs/storage/src/storage_contract.rs | 2 +- programs/vest/src/vest_instruction.rs | 2 +- programs/vote/src/vote_instruction.rs | 2 +- 24 files changed, 28 insertions(+), 29 deletions(-) rename programs/{librapay_api => librapay}/.gitignore (100%) rename programs/{librapay_api => librapay}/Cargo.lock (100%) rename programs/{librapay_api => librapay}/Cargo.toml (89%) rename programs/{librapay_api => librapay}/src/lib.rs (100%) rename programs/{librapay_api => librapay}/src/librapay_instruction.rs (100%) rename programs/{librapay_api => librapay}/src/librapay_transaction.rs (100%) rename programs/{ownable_api => ownable}/Cargo.toml (80%) rename programs/{ownable_api => ownable}/src/lib.rs (100%) rename programs/{ownable_api => ownable}/src/ownable_instruction.rs (92%) rename programs/{ownable_api => ownable}/src/ownable_processor.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index fcf9515cbc..a3ed1a80d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3131,7 +3131,7 @@ dependencies = [ "solana-core 0.22.0", "solana-drone 0.22.0", "solana-genesis 0.22.0", - "solana-librapay-api 0.22.0", + "solana-librapay 0.22.0", "solana-local-cluster 0.22.0", "solana-logger 0.22.0", "solana-measure 0.22.0", @@ -3599,7 +3599,7 @@ dependencies = [ ] [[package]] -name = "solana-librapay-api" +name = "solana-librapay" version = "0.22.0" dependencies = [ "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3766,7 +3766,7 @@ dependencies = [ ] [[package]] -name = "solana-ownable-api" +name = "solana-ownable" version = "0.22.0" dependencies = [ "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/Cargo.toml b/Cargo.toml index 1cf366aaf9..abec535974 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ members = [ "programs/exchange", "programs/failure", "programs/noop", - "programs/ownable_api", + "programs/ownable", "programs/stake", "programs/stake_tests", "programs/storage", @@ -55,5 +55,5 @@ members = [ exclude = [ "programs/bpf", "programs/move_loader", - "programs/librapay_api", + "programs/librapay", ] diff --git a/bench-tps/Cargo.toml b/bench-tps/Cargo.toml index 9c7fee7e65..ce5e2d0c3e 100644 --- a/bench-tps/Cargo.toml +++ b/bench-tps/Cargo.toml @@ -21,7 +21,7 @@ solana-core = { path = "../core", version = "0.22.0" } solana-genesis = { path = "../genesis", version = "0.22.0" } solana-client = { path = "../client", version = "0.22.0" } solana-drone = { path = "../drone", version = "0.22.0" } -solana-librapay-api = { path = "../programs/librapay_api", version = "0.22.0", optional = true } +solana-librapay = { path = "../programs/librapay", version = "0.22.0", optional = true } solana-logger = { path = "../logger", version = "0.22.0" } solana-metrics = { path = "../metrics", version = "0.22.0" } solana-measure = { path = "../measure", version = "0.22.0" } @@ -36,4 +36,4 @@ serial_test_derive = "0.3.1" solana-local-cluster = { path = "../local-cluster", version = "0.22.0" } [features] -move = ["solana-librapay-api", "solana-move-loader-program"] +move = ["solana-librapay", "solana-move-loader-program"] diff --git a/bench-tps/src/bench.rs b/bench-tps/src/bench.rs index 5714030aa0..953a9b6b89 100644 --- a/bench-tps/src/bench.rs +++ b/bench-tps/src/bench.rs @@ -5,7 +5,7 @@ use solana_client::perf_utils::{sample_txs, SampleStats}; use solana_core::gen_keys::GenKeys; use solana_drone::drone::request_airdrop_transaction; #[cfg(feature = "move")] -use solana_librapay_api::{create_genesis, upload_mint_script, upload_payment_script}; +use solana_librapay::{create_genesis, upload_mint_script, upload_payment_script}; use solana_measure::measure::Measure; use solana_metrics::{self, datapoint_debug}; use solana_sdk::{ @@ -37,7 +37,7 @@ const MAX_TX_QUEUE_AGE: u64 = MAX_PROCESSING_AGE as u64 * DEFAULT_TICKS_PER_SLOT / DEFAULT_TICKS_PER_SECOND; #[cfg(feature = "move")] -use solana_librapay_api::librapay_transaction; +use solana_librapay::librapay_transaction; pub const MAX_SPENDS_PER_TX: u64 = 4; diff --git a/book/src/cluster/stake-delegation-and-rewards.md b/book/src/cluster/stake-delegation-and-rewards.md index 952d7374ec..bf66162e53 100644 --- a/book/src/cluster/stake-delegation-and-rewards.md +++ b/book/src/cluster/stake-delegation-and-rewards.md @@ -99,7 +99,7 @@ The Stake account is moved from Ininitialized to StakeState::Stake form. This is * `account[0]` - RW - The StakeState::Stake instance. `StakeState::Stake::credits_observed` is initialized to `VoteState::credits`, `StakeState::Stake::voter_pubkey` is initialized to `account[1]`. If this is the initial delegation of stake, `StakeState::Stake::stake` is initialized to the account's balance in lamports, `StakeState::Stake::activated` is initialized to the current Bank epoch, and `StakeState::Stake::deactivated` is initialized to std::u64::MAX * `account[1]` - R - The VoteState instance. * `account[2]` - R - sysvar::clock account, carries information about current Bank epoch -* `account[3]` - R - stake\_api::Config accoount, carries warmup, cooldown, and slashing configuration +* `account[3]` - R - stake::Config accoount, carries warmup, cooldown, and slashing configuration ### StakeInstruction::Authorize\(Pubkey, StakeAuthorize\) diff --git a/ci/test-stable.sh b/ci/test-stable.sh index bff86816dc..fb9fba0ffd 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -96,7 +96,7 @@ test-move) ^ci/test-stable.sh \ ^ci/test-move.sh \ ^programs/move_loader \ - ^programs/librapay_api \ + ^programs/librapay \ ^logger/ \ ^runtime/ \ ^sdk/ \ @@ -106,7 +106,7 @@ test-move) exit 0 } _ cargo +"$rust_stable" test --manifest-path programs/move_loader/Cargo.toml ${V:+--verbose} -- --nocapture - _ cargo +"$rust_stable" test --manifest-path programs/librapay_api/Cargo.toml ${V:+--verbose} -- --nocapture + _ cargo +"$rust_stable" test --manifest-path programs/librapay/Cargo.toml ${V:+--verbose} -- --nocapture exit 0 ;; test-local-cluster) diff --git a/programs/btc_spv/src/header_store.rs b/programs/btc_spv/src/header_store.rs index c4fa974b73..3bdb588197 100644 --- a/programs/btc_spv/src/header_store.rs +++ b/programs/btc_spv/src/header_store.rs @@ -5,7 +5,7 @@ use solana_sdk::pubkey::Pubkey; // HeaderStore is a data structure that allows linked list style cheap appends and // sequential reads, but also has a "lookup index" to speed up random access -#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] +#[derive(Debug, PartialEq, Eq, Clone)] pub enum HeaderStoreError { InvalidHeader, GroupExists, diff --git a/programs/btc_spv/src/spv_state.rs b/programs/btc_spv/src/spv_state.rs index 6817367927..37ca683cf9 100644 --- a/programs/btc_spv/src/spv_state.rs +++ b/programs/btc_spv/src/spv_state.rs @@ -399,7 +399,7 @@ impl Default for AccountState { } ///Errors -#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] +#[derive(Debug, PartialEq, Eq, Clone)] pub enum SpvError { InvalidBlockHeader, // blockheader is malformed or out of order diff --git a/programs/btc_spv/src/utils.rs b/programs/btc_spv/src/utils.rs index 125bbcbc1c..31545c6dc4 100644 --- a/programs/btc_spv/src/utils.rs +++ b/programs/btc_spv/src/utils.rs @@ -30,7 +30,7 @@ impl fmt::Display for DecodeHexError { } } -#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)] +#[derive(Debug, PartialEq, Eq, Clone)] pub enum LengthError { OddLength, Maximum(u32), diff --git a/programs/budget/src/budget_instruction.rs b/programs/budget/src/budget_instruction.rs index 2b848e0627..87705595b0 100644 --- a/programs/budget/src/budget_instruction.rs +++ b/programs/budget/src/budget_instruction.rs @@ -11,7 +11,7 @@ use solana_sdk::{ system_instruction, }; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] pub enum BudgetError { DestinationMissing, } diff --git a/programs/librapay_api/.gitignore b/programs/librapay/.gitignore similarity index 100% rename from programs/librapay_api/.gitignore rename to programs/librapay/.gitignore diff --git a/programs/librapay_api/Cargo.lock b/programs/librapay/Cargo.lock similarity index 100% rename from programs/librapay_api/Cargo.lock rename to programs/librapay/Cargo.lock diff --git a/programs/librapay_api/Cargo.toml b/programs/librapay/Cargo.toml similarity index 89% rename from programs/librapay_api/Cargo.toml rename to programs/librapay/Cargo.toml index 1b15fd9b05..d0b03d002b 100644 --- a/programs/librapay_api/Cargo.toml +++ b/programs/librapay/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "solana-librapay-api" +name = "solana-librapay" version = "0.22.0" description = "Solana Libra Payment" authors = ["Solana Maintainers "] @@ -19,5 +19,5 @@ language_e2e_tests = { version = "0.0.1-sol4", package = "solana_libra_language_ types = { version = "0.0.1-sol4", package = "solana_libra_types" } [lib] -crate-type = ["lib"] -name = "solana_librapay_api" +crate-type = ["lib", "cdylib"] +name = "solana_librapay" diff --git a/programs/librapay_api/src/lib.rs b/programs/librapay/src/lib.rs similarity index 100% rename from programs/librapay_api/src/lib.rs rename to programs/librapay/src/lib.rs diff --git a/programs/librapay_api/src/librapay_instruction.rs b/programs/librapay/src/librapay_instruction.rs similarity index 100% rename from programs/librapay_api/src/librapay_instruction.rs rename to programs/librapay/src/librapay_instruction.rs diff --git a/programs/librapay_api/src/librapay_transaction.rs b/programs/librapay/src/librapay_transaction.rs similarity index 100% rename from programs/librapay_api/src/librapay_transaction.rs rename to programs/librapay/src/librapay_transaction.rs diff --git a/programs/ownable_api/Cargo.toml b/programs/ownable/Cargo.toml similarity index 80% rename from programs/ownable_api/Cargo.toml rename to programs/ownable/Cargo.toml index b2cf6681da..a561c13d40 100644 --- a/programs/ownable_api/Cargo.toml +++ b/programs/ownable/Cargo.toml @@ -1,7 +1,7 @@ [package] -name = "solana-ownable-api" +name = "solana-ownable" version = "0.22.0" -description = "ownable program API" +description = "ownable program" authors = ["Solana Maintainers "] repository = "https://github.com/solana-labs/solana" license = "Apache-2.0" @@ -20,5 +20,5 @@ num-traits = "0.2" solana-runtime = { path = "../../runtime", version = "0.22.0" } [lib] -crate-type = ["lib"] -name = "solana_ownable_api" +crate-type = ["lib", "cdylib"] +name = "solana_ownable" diff --git a/programs/ownable_api/src/lib.rs b/programs/ownable/src/lib.rs similarity index 100% rename from programs/ownable_api/src/lib.rs rename to programs/ownable/src/lib.rs diff --git a/programs/ownable_api/src/ownable_instruction.rs b/programs/ownable/src/ownable_instruction.rs similarity index 92% rename from programs/ownable_api/src/ownable_instruction.rs rename to programs/ownable/src/ownable_instruction.rs index 3d49302c1b..71de188776 100644 --- a/programs/ownable_api/src/ownable_instruction.rs +++ b/programs/ownable/src/ownable_instruction.rs @@ -1,5 +1,4 @@ use num_derive::{FromPrimitive, ToPrimitive}; -use serde_derive::{Deserialize, Serialize}; use solana_sdk::{ instruction::{AccountMeta, Instruction}, instruction_processor_utils::DecodeError, @@ -7,7 +6,7 @@ use solana_sdk::{ system_instruction, }; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] pub enum OwnableError { IncorrectOwner, } diff --git a/programs/ownable_api/src/ownable_processor.rs b/programs/ownable/src/ownable_processor.rs similarity index 100% rename from programs/ownable_api/src/ownable_processor.rs rename to programs/ownable/src/ownable_processor.rs diff --git a/programs/stake/src/stake_instruction.rs b/programs/stake/src/stake_instruction.rs index 3587e9acd1..ffc10eae7f 100644 --- a/programs/stake/src/stake_instruction.rs +++ b/programs/stake/src/stake_instruction.rs @@ -17,7 +17,7 @@ use solana_sdk::{ }; /// Reasons the stake might have had an error -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] pub enum StakeError { NoCreditsToRedeem, LockupInForce, diff --git a/programs/storage/src/storage_contract.rs b/programs/storage/src/storage_contract.rs index c8d5cfe218..559788a342 100644 --- a/programs/storage/src/storage_contract.rs +++ b/programs/storage/src/storage_contract.rs @@ -38,7 +38,7 @@ impl Credits { } } -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive)] pub enum StorageError { InvalidSegment, InvalidBlockhash, diff --git a/programs/vest/src/vest_instruction.rs b/programs/vest/src/vest_instruction.rs index ba3a013987..42b7ff48ee 100644 --- a/programs/vest/src/vest_instruction.rs +++ b/programs/vest/src/vest_instruction.rs @@ -10,7 +10,7 @@ use solana_sdk::{ system_instruction, }; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive)] pub enum VestError { DestinationMissing, Unauthorized, diff --git a/programs/vote/src/vote_instruction.rs b/programs/vote/src/vote_instruction.rs index adbc05e660..1975e9ddc9 100644 --- a/programs/vote/src/vote_instruction.rs +++ b/programs/vote/src/vote_instruction.rs @@ -19,7 +19,7 @@ use solana_sdk::{ }; /// Reasons the stake might have had an error -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] +#[derive(Debug, Clone, PartialEq, FromPrimitive, ToPrimitive)] pub enum VoteError { VoteTooOld, SlotsMismatch,