diff --git a/sdk/Cargo.toml b/sdk/Cargo.toml index d90b4c556b..49dc8746bd 100644 --- a/sdk/Cargo.toml +++ b/sdk/Cargo.toml @@ -14,11 +14,10 @@ edition = "2018" # solana-program crate program = [] -# "everything" includes functionality that is not compatible or needed for on-chain programs default = [ - "everything" + "full" # functionality that is not compatible or needed for on-chain programs ] -everything = [ +full = [ "assert_matches", "byteorder", "chrono", diff --git a/sdk/src/client.rs b/sdk/src/client.rs index 70fe20bff7..20d3c1719a 100644 --- a/sdk/src/client.rs +++ b/sdk/src/client.rs @@ -7,7 +7,7 @@ //! Asynchronous implementations are expected to create transactions, sign them, and send //! them but without waiting to see if the server accepted it. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::{ account::Account, diff --git a/sdk/src/genesis_config.rs b/sdk/src/genesis_config.rs index 9642383ea5..40502a1508 100644 --- a/sdk/src/genesis_config.rs +++ b/sdk/src/genesis_config.rs @@ -1,6 +1,6 @@ //! The `genesis_config` module is a library for generating the chain's genesis config. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::{ account::Account, diff --git a/sdk/src/hard_forks.rs b/sdk/src/hard_forks.rs index 07784f43c6..42a2b2e568 100644 --- a/sdk/src/hard_forks.rs +++ b/sdk/src/hard_forks.rs @@ -1,7 +1,7 @@ //! The `hard_forks` module is used to maintain the list of slot boundaries for when a hard fork //! should occur. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use byteorder::{ByteOrder, LittleEndian}; use solana_sdk::clock::Slot; diff --git a/sdk/src/hash.rs b/sdk/src/hash.rs index 1327eb2b5d..c8326220bf 100644 --- a/sdk/src/hash.rs +++ b/sdk/src/hash.rs @@ -1,7 +1,7 @@ pub use solana_program::hash::*; /// random hash value for tests and benchmarks. -#[cfg(feature = "everything")] +#[cfg(feature = "full")] pub fn new_rand(rng: &mut R) -> Hash where R: rand::Rng, diff --git a/sdk/src/pubkey.rs b/sdk/src/pubkey.rs index 165366e4e3..32c5889386 100644 --- a/sdk/src/pubkey.rs +++ b/sdk/src/pubkey.rs @@ -1,12 +1,12 @@ pub use solana_program::pubkey::*; /// New random Pubkey for tests and benchmarks. -#[cfg(feature = "everything")] +#[cfg(feature = "full")] pub fn new_rand() -> Pubkey { Pubkey::new(&rand::random::<[u8; 32]>()) } -#[cfg(feature = "everything")] +#[cfg(feature = "full")] pub fn write_pubkey_file(outfile: &str, pubkey: Pubkey) -> Result<(), Box> { use std::io::Write; @@ -22,7 +22,7 @@ pub fn write_pubkey_file(outfile: &str, pubkey: Pubkey) -> Result<(), Box Result> { let f = std::fs::File::open(infile.to_string())?; let printable: String = serde_json::from_reader(f)?; diff --git a/sdk/src/secp256k1.rs b/sdk/src/secp256k1.rs index b5f30be8ba..efb3492d2f 100644 --- a/sdk/src/secp256k1.rs +++ b/sdk/src/secp256k1.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use digest::Digest; use serde_derive::{Deserialize, Serialize}; diff --git a/sdk/src/shred_version.rs b/sdk/src/shred_version.rs index f06b66f374..de92687335 100644 --- a/sdk/src/shred_version.rs +++ b/sdk/src/shred_version.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use solana_sdk::{ hard_forks::HardForks, diff --git a/sdk/src/signature.rs b/sdk/src/signature.rs index a45a4f966f..08b8ad3ca1 100644 --- a/sdk/src/signature.rs +++ b/sdk/src/signature.rs @@ -1,5 +1,5 @@ //! The `signature` module provides functionality for public, and private keys. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::{pubkey::Pubkey, transaction::TransactionError}; use ed25519_dalek::Signer as DalekSigner; diff --git a/sdk/src/signers.rs b/sdk/src/signers.rs index 1c7b9a5502..e25b6a059d 100644 --- a/sdk/src/signers.rs +++ b/sdk/src/signers.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::{ pubkey::Pubkey, signature::{Signature, Signer, SignerError}, diff --git a/sdk/src/system_transaction.rs b/sdk/src/system_transaction.rs index cd23335c6c..526dcd7dce 100644 --- a/sdk/src/system_transaction.rs +++ b/sdk/src/system_transaction.rs @@ -1,5 +1,5 @@ //! The `system_transaction` module provides functionality for creating system transactions. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::{ hash::Hash, diff --git a/sdk/src/transaction.rs b/sdk/src/transaction.rs index 7b18d580a2..aa23ec624c 100644 --- a/sdk/src/transaction.rs +++ b/sdk/src/transaction.rs @@ -1,6 +1,6 @@ //! Defines a Transaction type to package an atomic sequence of instructions. -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::sanitize::{Sanitize, SanitizeError}; use crate::secp256k1::verify_eth_addresses; diff --git a/sdk/src/transport.rs b/sdk/src/transport.rs index 287047e769..db4cef4bb0 100644 --- a/sdk/src/transport.rs +++ b/sdk/src/transport.rs @@ -1,4 +1,4 @@ -#![cfg(feature = "everything")] +#![cfg(feature = "full")] use crate::transaction::TransactionError; use std::io;