From 69ef9dee1930203f299754cda527e9e32dd017af Mon Sep 17 00:00:00 2001 From: Graydon Hoare Date: Wed, 2 Aug 2023 22:33:03 -0700 Subject: [PATCH] mop up some residual uses of format strings in errors (no longer supported) (#961) --- soroban-env-host/src/native_contract/token/allowance.rs | 6 +++--- soroban-env-host/src/native_contract/token/balance.rs | 4 ++-- soroban-env-host/src/native_contract/token/contract.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/soroban-env-host/src/native_contract/token/allowance.rs b/soroban-env-host/src/native_contract/token/allowance.rs index de047e3ea..e5b08f566 100644 --- a/soroban-env-host/src/native_contract/token/allowance.rs +++ b/soroban-env-host/src/native_contract/token/allowance.rs @@ -41,7 +41,7 @@ pub fn write_allowance( Err(err!( e, ContractError::AllowanceError, - "expiration is greater than max: {} > {}", + "expiration is greater than max", expiration, li.max_entry_expiration )) @@ -49,7 +49,7 @@ pub fn write_allowance( Err(err!( e, ContractError::AllowanceError, - "expiration must be >= ledger sequence: {} < {}", + "expiration must be >= ledger sequence", expiration, li.sequence_number )) @@ -137,7 +137,7 @@ pub fn spend_allowance( return Err(err!( e, ContractError::AllowanceError, - "not enough allowance to spend: {} < {}", + "not enough allowance to spend", allowance, amount )); diff --git a/soroban-env-host/src/native_contract/token/balance.rs b/soroban-env-host/src/native_contract/token/balance.rs index 2f637c46f..5b5702f0c 100644 --- a/soroban-env-host/src/native_contract/token/balance.rs +++ b/soroban-env-host/src/native_contract/token/balance.rs @@ -417,7 +417,7 @@ fn transfer_account_balance(e: &Host, account_id: AccountId, amount: i64) -> Res Err(err!( e, ContractError::BalanceError, - "resulting balance is not within the allowed range: {} < {} < {} does not hold", + "resulting balance is not within the allowed range", min_balance, new_balance, max_balance @@ -457,7 +457,7 @@ fn transfer_trustline_balance( Err(err!( e, ContractError::BalanceError, - "resulting balance is not within the allowed range: {} < {} < {} does not hold", + "resulting balance is not within the allowed range", min_balance, new_balance, max_balance diff --git a/soroban-env-host/src/native_contract/token/contract.rs b/soroban-env-host/src/native_contract/token/contract.rs index b105516e2..e0ee005bb 100644 --- a/soroban-env-host/src/native_contract/token/contract.rs +++ b/soroban-env-host/src/native_contract/token/contract.rs @@ -88,7 +88,7 @@ fn check_nonnegative_amount(e: &Host, amount: i128) -> Result<(), HostError> { Err(err!( e, ContractError::NegativeAmountError, - "negative amount is not allowed: {}", + "negative amount is not allowed", amount )) } else {