From 6ca575b5a3d1582217c3e38f9c0f660f9c04ba99 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 30 Dec 2019 12:28:41 -0700 Subject: [PATCH] Make sol-to-lamport const name more clear (#7641) automerge --- bench-tps/src/cli.rs | 2 +- faucet/src/faucet.rs | 2 +- genesis/src/genesis_accounts.rs | 92 ++++++++++++++++----------------- genesis/src/validators.rs | 6 +-- sdk/src/native_token.rs | 6 +-- 5 files changed, 54 insertions(+), 54 deletions(-) diff --git a/bench-tps/src/cli.rs b/bench-tps/src/cli.rs index af3b90e07..01d19fea9 100644 --- a/bench-tps/src/cli.rs +++ b/bench-tps/src/cli.rs @@ -4,7 +4,7 @@ use solana_sdk::fee_calculator::FeeCalculator; use solana_sdk::signature::{read_keypair_file, Keypair, KeypairUtil}; use std::{net::SocketAddr, process::exit, time::Duration}; -const NUM_LAMPORTS_PER_ACCOUNT_DEFAULT: u64 = solana_sdk::native_token::SOL_LAMPORTS; +const NUM_LAMPORTS_PER_ACCOUNT_DEFAULT: u64 = solana_sdk::native_token::LAMPORTS_PER_SOL; /// Holds the configuration for a single run of the benchmark pub struct Config { diff --git a/faucet/src/faucet.rs b/faucet/src/faucet.rs index 2da3ab95d..6c07448f8 100644 --- a/faucet/src/faucet.rs +++ b/faucet/src/faucet.rs @@ -45,7 +45,7 @@ macro_rules! socketaddr { } pub const TIME_SLICE: u64 = 60; -pub const REQUEST_CAP: u64 = solana_sdk::native_token::SOL_LAMPORTS * 1_000_000; +pub const REQUEST_CAP: u64 = solana_sdk::native_token::LAMPORTS_PER_SOL * 1_000_000; pub const FAUCET_PORT: u16 = 9900; pub const FAUCET_PORT_STR: &str = "9900"; diff --git a/genesis/src/genesis_accounts.rs b/genesis/src/genesis_accounts.rs index 6793874ca..8edb48f88 100644 --- a/genesis/src/genesis_accounts.rs +++ b/genesis/src/genesis_accounts.rs @@ -3,7 +3,7 @@ use crate::{ unlocks::UnlockInfo, validators::{create_and_add_validator, ValidatorInfo}, }; -use solana_sdk::{genesis_config::GenesisConfig, native_token::SOL_LAMPORTS}; +use solana_sdk::{genesis_config::GenesisConfig, native_token::LAMPORTS_PER_SOL}; // 30 month schedule is 1/5th every 6 months for 30 months const UNLOCKS_BY_FIFTHS_FOR_30_MONTHS: UnlockInfo = UnlockInfo { @@ -36,107 +36,107 @@ pub const BATCH_FOUR_STAKER_INFOS: &[StakerInfo] = &[ StakerInfo { name: "impossible pizza", staker: "CDtJpwRSiPRDGeKrvymWQKM7JY9M3hU7iimEKBDxZyoP", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "wretched texture", staker: "HbENu65qjWLEB5TrMouSSWLq9mbtGx2bvfhPjk2FpYek", - lamports: 225_000 * SOL_LAMPORTS, + lamports: 225_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "nutritious examination", staker: "C9CfFpmLDsQsz6wt7MrrZquNB5oS4QkpJkmDAiboVEZZ", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "tidy impression", staker: "6ne6Rbag4FAnop1KNgVdM1SEHnJEysHSWyqvRpFrzaig", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "unbecoming silver", staker: "42yapY7Vrs5jqht9TCKZsPoyb4vDFYcPfRkqAP85NSAQ", - lamports: 28_800 * SOL_LAMPORTS, + lamports: 28_800 * LAMPORTS_PER_SOL, }, StakerInfo { name: "dramatic treatment", staker: "GTyawCMwt3kMb51AgDtfdp97mDot7jNwc8ifuS9qqANg", - lamports: 1_205_602 * SOL_LAMPORTS, + lamports: 1_205_602 * LAMPORTS_PER_SOL, }, StakerInfo { name: "angry noise", staker: "Fqxs9MhqjKuMq6YwjBG4ktEapuZQ3kj19mpuHLZKtkg9", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "hard cousin", staker: "9MYDzj7QuAX9QAK7da1GhzPB4gA3qbPNWsW3MMSZobru", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "inexpensive uncle", staker: "E4DLNkmdL34ejA48ApfPDoFVuD9XWAFqi8bXzBGRhKst", - lamports: 300_000 * SOL_LAMPORTS, + lamports: 300_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "lopsided skill", staker: "8cV7zCTF5UMrZakZXiL2Jw5uY3ms2Wz4twzFXEY9Kge2", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "red snake", staker: "JBGnGdLyo7V2z9hz51mnnbyDp9sBACtw5WYH9YRG8n7e", - lamports: 3_655_292 * SOL_LAMPORTS, + lamports: 3_655_292 * LAMPORTS_PER_SOL, }, StakerInfo { name: "hellish money", staker: "CqKdQ57mBj2mKcAbpjWc28Ls7yXzBXboxSTCRWocmUVj", - lamports: 200_000 * SOL_LAMPORTS, + lamports: 200_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "full grape", staker: "2SCJKvh7wWo32PtfUZdVZQ84WnMWoUpF4WTm6ZxcCJ15", - lamports: 450_000 * SOL_LAMPORTS, + lamports: 450_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "nice ghost", staker: "FeumxB3gfzrVQzABBiha8AacKPY3Rf4BTFSh2aZWHqR8", - lamports: 650_000 * SOL_LAMPORTS, + lamports: 650_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "jolly year", staker: "HBwFWNGPVZgkf3yqUKxuAds5aANGWX62LzUFvZVCWLdJ", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "typical initiative", staker: "3JMz3kaDUZEVK2JVjRqwERGMp7LbWbgUjAFBb42qxoHb", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "deserted window", staker: "XTeBBZextvHkoRqDF8yb4hihjcraKQDwTEXhzjd8fip", - lamports: 3_655_292 * SOL_LAMPORTS, + lamports: 3_655_292 * LAMPORTS_PER_SOL, }, StakerInfo { name: "eight nation", staker: "E5bSU5ywqPiz3ije89ef5gaEC7jy81BAc72Zeb9MqeHY", - lamports: 103_519 * SOL_LAMPORTS, + lamports: 103_519 * LAMPORTS_PER_SOL, }, StakerInfo { name: "earsplitting meaning", staker: "4ZemkSoE75RFE1SVLnnmHcaNWT4qN8KFrKP2wAYfv8CB", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "alike cheese", staker: "72BGEwYee5txFonmpEarTEKCZVN2UxcSUgdphdhcx3V", - lamports: 3_880_295 * SOL_LAMPORTS, + lamports: 3_880_295 * LAMPORTS_PER_SOL, }, StakerInfo { name: "noisy honey", staker: "DRp1Scyn4yJZQfMAdQew2x8RtvRmsNELN37JTK5Xvzgn", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, ]; @@ -144,12 +144,12 @@ pub const FOUNDATION_STAKER_INFOS: &[StakerInfo] = &[ StakerInfo { name: "lyrical supermarket", staker: "GRZwoJGisLTszcxtWpeREJ98EGg8pZewhbtcrikoU7b3", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "frequent description", staker: "J51tinoLdmEdUR27LUVymrb2LB3xQo1aSHSgmbSGdj58", - lamports: 57_500_000 * SOL_LAMPORTS, + lamports: 57_500_000 * LAMPORTS_PER_SOL, }, ]; @@ -157,12 +157,12 @@ pub const GRANTS_STAKER_INFOS: &[StakerInfo] = &[ StakerInfo { name: "rightful agreement", staker: "DNaKiBwwbbqk1wVoC5AQxWQbuDhvaDVbAtXzsVos9mrc", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "tasty location", staker: "HvXQPXAijjG1vnQs6HXVtUUtFVzi5HNgXV9LGnHvYF85", - lamports: 15_000_000 * SOL_LAMPORTS, + lamports: 15_000_000 * LAMPORTS_PER_SOL, }, ]; @@ -170,17 +170,17 @@ pub const COMMUNITY_STAKER_INFOS: &[StakerInfo] = &[ StakerInfo { name: "shrill charity", staker: "BzuqQFnu7oNUeok9ZoJezpqu2vZJU7XR1PxVLkk6wwUD", - lamports: 5_000_000 * SOL_LAMPORTS, + lamports: 5_000_000 * LAMPORTS_PER_SOL, }, StakerInfo { name: "legal gate", staker: "FwMbkDZUb78aiMWhZY4BEroAcqmnrXZV77nwrg71C57d", - lamports: 16_086_641 * SOL_LAMPORTS, + lamports: 16_086_641 * LAMPORTS_PER_SOL, }, StakerInfo { name: "cluttered complaint", staker: "4h1rt2ic4AXwG7p3Qqhw57EMDD4c3tLYb5J3QstGA2p5", - lamports: 153_333_633 * SOL_LAMPORTS + 41 * SOL_LAMPORTS / 100, + lamports: 153_333_633 * LAMPORTS_PER_SOL + 41 * LAMPORTS_PER_SOL / 100, }, ]; @@ -203,70 +203,70 @@ pub const VALIDATOR_INFOS: &[ValidatorInfo] = &[ name: "01Node", node: "5n8KCdzqtvTnhkvCrFR7errH6ZUp11kL97r2awXkfzFe", vote: "4uYMbY5Ae5ZSRNxQ3RWVyXS9rzW7E3AMZYHuUEotxu6K", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "Bison Trails", node: "7suRNpX7bJsXphHJtBv4ZsLjJZ1dTGeX256pLqJZdEAm", vote: "DfirEZ9Up1xbE7sQji9UwtcRGe5uCcRqQtnaGpha5KNY", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "ChainFlow", node: "2te46rxywMdCNdkvjumiBBPQoVczJFxhxEaxFavQNqe3", vote: "8bRCnytB7bySmqxodNGbZuUAtncKkB8T733DD1Dm9WMb", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "ChorusOne", node: "ChorusXqjLC2NbiStKR6k9WoD7wu6TVTtFG8qCL5XBVa", vote: "ChorusvBuPwukqgDvYfWtEg8j4T1NcMgSTQ4b1UbAwgQ", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "Dokia Capital", node: "GeZ5PrJi9muVCJiJAaFBNGoCEdxGEqTp7L2BmT2WTTy1", vote: "7ZdRx2EBYoRuPfyeoNbuHodMUXcAQRcC37MUw3kP6akn", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "Forbole", node: "Fe5sLQAAT7RBT8mcH1AAGCbExJQcYxcwXvp1GjrGbvxs", vote: "Dr8MkZZuvZVQJFKtjShZYEfg6n93sc1GxevqLnGss7FW", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "P2P.ORG - Secure Non-custodial Staking", node: "44e8VyWoyZSE2oYHxMHMedAiHkGJqJgPd3tdt6iKoAFL", vote: "BwwpzEpo1wzgV9N1987ntgNG6jLt3C9532C68pswT7Gp", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "RockX", node: "Ez4iUU87ViJLCnmSy1t1Ti3DLoysFXiBseNfnRfoehyY", vote: "GUdGALCHQBeqkNc2ZAht3tBXab1N5u9qJC3PAzpL54r7", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "Stake Capital", node: "HavuVVDXXsJqMzPwQ4KcF5kFm2xqjbChhyi1bgGeCQif", vote: "HswPkKj1xoLLmpM8t1vy5Pbi8zYYUs9ZawswvofKsFo1", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ValidatorInfo { name: "Staking Facilities", node: "pbAxyqHHPMwgEjv8kmjGxysk9rhNtN7q22eAjReq6Hj", vote: "4VZ3pJX19PpuGjoSB1qeN9sVQfrqgLVNg16is37adiFp", - node_lamports: 500 * SOL_LAMPORTS, + node_lamports: 500 * LAMPORTS_PER_SOL, commission: 0, }, ]; @@ -286,22 +286,22 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig, mut issued_lampo genesis_config, &BATCH_FOUR_STAKER_INFOS, &UNLOCKS_BY_FIFTHS_FOR_30_MONTHS, - 1_000_000 * SOL_LAMPORTS, + 1_000_000 * LAMPORTS_PER_SOL, ) + add_stakes( genesis_config, &FOUNDATION_STAKER_INFOS, &UNLOCKS_BY_TENTHS_FOR_60_MONTHS, - 1_000_000 * SOL_LAMPORTS, + 1_000_000 * LAMPORTS_PER_SOL, ) + add_stakes( genesis_config, &GRANTS_STAKER_INFOS, &UNLOCKS_BY_TENTHS_FOR_60_MONTHS, - 1_000_000 * SOL_LAMPORTS, + 1_000_000 * LAMPORTS_PER_SOL, ) + add_stakes( genesis_config, &COMMUNITY_STAKER_INFOS, &UNLOCKS_ALL_DAY_ZERO, - 1_000_000 * SOL_LAMPORTS, + 1_000_000 * LAMPORTS_PER_SOL, ) + add_validators(genesis_config, &VALIDATOR_INFOS); // "one thanks" (community pool) gets 500_000_000SOL (total) - above distributions @@ -310,10 +310,10 @@ pub fn add_genesis_accounts(genesis_config: &mut GenesisConfig, mut issued_lampo &StakerInfo { name: "one thanks", staker: "3b7akieYUyCgz3Cwt5sTSErMWjg8NEygD6mbGjhGkduB", - lamports: 500_000_000 * SOL_LAMPORTS - issued_lamports, + lamports: 500_000_000 * LAMPORTS_PER_SOL - issued_lamports, }, &UNLOCKS_ALL_DAY_ZERO, - 1_000_000 * SOL_LAMPORTS, + 1_000_000 * LAMPORTS_PER_SOL, ); } @@ -333,6 +333,6 @@ mod tests { .map(|(_, account)| account.lamports) .sum::(); - assert_eq!(500_000_000 * SOL_LAMPORTS, lamports); + assert_eq!(500_000_000 * LAMPORTS_PER_SOL, lamports); } } diff --git a/genesis/src/validators.rs b/genesis/src/validators.rs index bfefae37c..60a040fbd 100644 --- a/genesis/src/validators.rs +++ b/genesis/src/validators.rs @@ -69,7 +69,7 @@ pub fn create_and_add_validator( #[cfg(test)] mod tests { use super::*; - use solana_sdk::{native_token::SOL_LAMPORTS, rent::Rent}; + use solana_sdk::{native_token::LAMPORTS_PER_SOL, rent::Rent}; fn create_and_check_validators( genesis_config: &mut GenesisConfig, @@ -144,7 +144,7 @@ mod tests { let total_lamports = VoteState::get_rent_exempt_reserve(&rent) * 2 + calculate_voting_fees(&genesis_config, 1.0) * 2 // two vote accounts + rent.minimum_balance(0) // one node account - + 1 * SOL_LAMPORTS; // 2nd vote account ask has SOL + + 1 * LAMPORTS_PER_SOL; // 2nd vote account ask has SOL // weird case, just wanted to verify that the duplicated node account gets double fees create_and_check_validators( @@ -160,7 +160,7 @@ mod tests { ValidatorInfo { name: "unfun", node: "3VTm54dw8w6jTTsPH4BfoV5vo6mF985JAMtNDRYcaGFc", // random pubkeys, same node - node_lamports: 1 * SOL_LAMPORTS, + node_lamports: 1 * LAMPORTS_PER_SOL, vote: "8XrFPRULg98kSm535kFaLV4GMnK5JQSuAymyrCHXsUcy", commission: 50, }, diff --git a/sdk/src/native_token.rs b/sdk/src/native_token.rs index 789f521d8..816efc161 100644 --- a/sdk/src/native_token.rs +++ b/sdk/src/native_token.rs @@ -1,12 +1,12 @@ /// There are 10^9 lamports in one SOL -pub const SOL_LAMPORTS: u64 = 1_000_000_000; +pub const LAMPORTS_PER_SOL: u64 = 1_000_000_000; /// Approximately convert fractional native tokens (lamports) into native tokens (SOL) pub fn lamports_to_sol(lamports: u64) -> f64 { - lamports as f64 / SOL_LAMPORTS as f64 + lamports as f64 / LAMPORTS_PER_SOL as f64 } /// Approximately convert native tokens (SOL) into fractional native tokens (lamports) pub fn sol_to_lamports(sol: f64) -> u64 { - (sol * SOL_LAMPORTS as f64) as u64 + (sol * LAMPORTS_PER_SOL as f64) as u64 }