diff --git a/Cargo.lock b/Cargo.lock index 763031621..de768316b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3002,7 +3002,6 @@ dependencies = [ "solana-inflation", "solana-keypair", "solana-logger", - "solana-native-token", "solana-poh-config", "solana-pubkey", "solana-rent", diff --git a/genesis-config/Cargo.toml b/genesis-config/Cargo.toml index 0e8819c94..169c09d00 100644 --- a/genesis-config/Cargo.toml +++ b/genesis-config/Cargo.toml @@ -26,7 +26,6 @@ solana-hash = { workspace = true } solana-inflation = { workspace = true } solana-keypair = { workspace = true } solana-logger = { workspace = true } -solana-native-token = { workspace = true } solana-poh-config = { workspace = true } solana-pubkey = { workspace = true } solana-rent = { workspace = true } diff --git a/genesis-config/src/lib.rs b/genesis-config/src/lib.rs index 6ea80c520..4ba1cf46a 100644 --- a/genesis-config/src/lib.rs +++ b/genesis-config/src/lib.rs @@ -15,7 +15,6 @@ use { chrono::{TimeZone, Utc}, memmap2::Mmap, solana_hash::Hash, - solana_native_token::lamports_to_sol_str, solana_sha256_hasher::hash, solana_shred_version::compute_shred_version, std::{ @@ -236,7 +235,7 @@ impl fmt::Display for GenesisConfig { {:?}\n\ {:?}\n\ {:?}\n\ - Capitalization: {} SOL in {} accounts\n\ + Capitalization: {} lamports in {} accounts\n\ Native instruction processors: {:#?}\n\ Rewards pool: {:#?}\n\ ", @@ -259,15 +258,13 @@ impl fmt::Display for GenesisConfig { self.inflation, self.rent, self.fee_rate_governor, - lamports_to_sol_str( - self.accounts - .iter() - .map(|(pubkey, account)| { - assert!(account.lamports > 0, "{:?}", (pubkey, account)); - account.lamports - }) - .sum::() - ), + self.accounts + .iter() + .map(|(pubkey, account)| { + assert!(account.lamports > 0, "{:?}", (pubkey, account)); + account.lamports + }) + .sum::(), self.accounts.len(), self.native_instruction_processors, self.rewards_pools, diff --git a/native-token/src/lib.rs b/native-token/src/lib.rs index 1ca68c5d3..1763c35b4 100644 --- a/native-token/src/lib.rs +++ b/native-token/src/lib.rs @@ -8,7 +8,10 @@ const LAMPORTS_PER_SOL_F64: f64 = LAMPORTS_PER_SOL as f64; const SOL_DECIMALS: usize = 9; /// Approximately convert fractional native tokens (lamports) into native tokens (SOL) -#[deprecated(since = "2.3.0", note = "lamports_to_sol_str")] +#[deprecated( + since = "2.3.0", + note = "solana_cli_output::display::build_balance_message" +)] pub fn lamports_to_sol(lamports: u64) -> f64 { lamports as f64 / LAMPORTS_PER_SOL_F64 } @@ -21,16 +24,6 @@ pub fn sol_to_lamports(sol: f64) -> u64 { (sol * LAMPORTS_PER_SOL_F64).round() as u64 } -/// Convert fractional native tokens (lamports) into native tokens (SOL) -pub fn lamports_to_sol_str(lamports: u64) -> String { - // Left-pad zeros to decimals + 1, so we at least have an integer zero - let mut s = format!("{:01$}", lamports, SOL_DECIMALS + 1); - // Add the decimal point (Sorry, "," locales!) - s.insert(s.len() - SOL_DECIMALS, '.'); - let zeros_trimmed = s.trim_end_matches('0'); - zeros_trimmed.trim_end_matches('.').to_string() -} - /// Convert native tokens (SOL) into fractional native tokens (lamports) pub fn sol_str_to_lamports(sol_str: &str) -> Option { if sol_str == "." { @@ -153,25 +146,6 @@ mod tests { ); } - #[test] - fn test_lamports_to_sol_str() { - assert_eq!("0", lamports_to_sol_str(0)); - assert_eq!("0.000000001", lamports_to_sol_str(1)); - assert_eq!("0.00000001", lamports_to_sol_str(10)); - assert_eq!("0.0000001", lamports_to_sol_str(100)); - assert_eq!("0.000001", lamports_to_sol_str(1000)); - assert_eq!("0.00001", lamports_to_sol_str(10000)); - assert_eq!("0.0001", lamports_to_sol_str(100000)); - assert_eq!("0.001", lamports_to_sol_str(1000000)); - assert_eq!("0.01", lamports_to_sol_str(10000000)); - assert_eq!("0.1", lamports_to_sol_str(100000000)); - assert_eq!("1", lamports_to_sol_str(1000000000)); - assert_eq!("4.1", lamports_to_sol_str(4_100_000_000)); - assert_eq!("8.2", lamports_to_sol_str(8_200_000_000)); - assert_eq!("8.50228288", lamports_to_sol_str(8_502_282_880)); - assert_eq!("18446744073.709551615", lamports_to_sol_str(u64::MAX)); - } - #[test] fn test_sol_str_to_lamports() { assert_eq!(0, sol_str_to_lamports("0.0").unwrap());