GH-671: base for PaymentAdjuster-checked payables

masq/src/commands/financials_command/parsing_and_value_dressing.rs

@@ -2,7 +2,7 @@
 
 pub(in crate::commands::financials_command) mod restricted {
     use crate::commands::financials_command::data_structures::restricted::UserOriginalTypingOfRanges;
-    use masq_lib::constants::{MASQ_TOTAL_SUPPLY, WEIS_OF_GWEI};
+    use masq_lib::constants::{MASQ_TOTAL_SUPPLY, WEIS_IN_GWEI};
     use masq_lib::utils::ExpectValue;
     use num::CheckedMul;
     use regex::{Captures, Regex};
@@ -15,8 +15,8 @@ pub(in crate::commands::financials_command) mod restricted {
 
     pub fn convert_masq_from_gwei_and_dress_well(balance_gwei: i64) -> String {
         const MASK_FOR_NON_SIGNIFICANT_DIGITS: i64 = 10_000_000;
-        let balance_masq_int = (balance_gwei / WEIS_OF_GWEI as i64).abs();
-        let balance_masq_frac = (balance_gwei % WEIS_OF_GWEI as i64).abs();
+        let balance_masq_int = (balance_gwei / WEIS_IN_GWEI as i64).abs();
+        let balance_masq_frac = (balance_gwei % WEIS_IN_GWEI as i64).abs();
         let balance_masq_frac_trunc = balance_masq_frac / MASK_FOR_NON_SIGNIFICANT_DIGITS;
         match (
             (balance_masq_int == 0) && (balance_masq_frac_trunc == 0),
@@ -310,7 +310,7 @@ mod tests {
         process_optionally_fractional_number,
     };
     use crate::commands::financials_command::test_utils::transpose_inputs_to_nested_tuples;
-    use masq_lib::constants::{MASQ_TOTAL_SUPPLY, WEIS_OF_GWEI};
+    use masq_lib::constants::{MASQ_TOTAL_SUPPLY, WEIS_IN_GWEI};
     use regex::Regex;
 
     #[test]
@@ -482,7 +482,7 @@ mod tests {
 
     #[test]
     fn i64_interpretation_capabilities_are_good_enough_for_masq_total_supply_in_gwei() {
-        let _: i64 = (MASQ_TOTAL_SUPPLY * WEIS_OF_GWEI as u64)
+        let _: i64 = (MASQ_TOTAL_SUPPLY * WEIS_IN_GWEI as u64)
             .try_into()
             .unwrap();
     }

masq_lib/src/constants.rs

@@ -20,7 +20,7 @@ pub const DEFAULT_GAS_PRICE: u64 = 1; //TODO ?? Really
 
 pub const WALLET_ADDRESS_LENGTH: usize = 42;
 pub const MASQ_TOTAL_SUPPLY: u64 = 37_500_000;
-pub const WEIS_OF_GWEI: i128 = 1_000_000_000;
+pub const WEIS_IN_GWEI: i128 = 1_000_000_000;
 
 pub const ETH_MAINNET_CONTRACT_CREATION_BLOCK: u64 = 11_170_708;
 pub const ROPSTEN_TESTNET_CONTRACT_CREATION_BLOCK: u64 = 8_688_171;
@@ -102,7 +102,7 @@ mod tests {
         assert_eq!(DEFAULT_GAS_PRICE, 1);
         assert_eq!(WALLET_ADDRESS_LENGTH, 42);
         assert_eq!(MASQ_TOTAL_SUPPLY, 37_500_000);
-        assert_eq!(WEIS_OF_GWEI, 1_000_000_000);
+        assert_eq!(WEIS_IN_GWEI, 1_000_000_000);
         assert_eq!(ETH_MAINNET_CONTRACT_CREATION_BLOCK, 11_170_708);
         assert_eq!(ROPSTEN_TESTNET_CONTRACT_CREATION_BLOCK, 8_688_171);
         assert_eq!(MULTINODE_TESTNET_CONTRACT_CREATION_BLOCK, 0);

multinode_integration_tests/tests/verify_bill_payment.rs

@@ -2,7 +2,7 @@
 use bip39::{Language, Mnemonic, Seed};
 use futures::Future;
 use masq_lib::blockchains::chains::Chain;
-use masq_lib::constants::WEIS_OF_GWEI;
+use masq_lib::constants::WEIS_IN_GWEI;
 use masq_lib::utils::{derivation_path, NeighborhoodModeLight};
 use multinode_integration_tests_lib::blockchain::BlockchainServer;
 use multinode_integration_tests_lib::masq_node::{MASQNode, MASQNodeUtils};
@@ -96,7 +96,7 @@ fn verify_bill_payment() {
         derivation_path(0, 3),
     );
 
-    let amount = 10 * payment_thresholds.permanent_debt_allowed_gwei as u128 * WEIS_OF_GWEI as u128;
+    let amount = 10 * payment_thresholds.permanent_debt_allowed_gwei as u128 * WEIS_IN_GWEI as u128;
 
     let project_root = MASQNodeUtils::find_project_root();
     let (consuming_node_name, consuming_node_index) = cluster.prepare_real_node(&consuming_config);
@@ -323,20 +323,26 @@ fn assert_balances(
     expected_eth_balance: &str,
     expected_token_balance: &str,
 ) {
-    if let (Ok(eth_balance), Ok(token_balance)) = blockchain_interface.get_balances(&wallet) {
-        assert_eq!(
-            format!("{}", eth_balance),
-            String::from(expected_eth_balance),
-            "EthBalance"
-        );
-        assert_eq!(
-            token_balance,
-            web3::types::U256::from_dec_str(expected_token_balance).unwrap(),
-            "TokenBalance"
-        );
-    } else {
-        assert!(false, "Failed to retrieve balances {}", wallet);
-    }
+    let eth_balance = blockchain_interface
+        .get_gas_balance(&wallet)
+        .unwrap_or_else(|_| panic!("Failed to retrieve gas balance for {}", wallet));
+    assert_eq!(
+        format!("{}", eth_balance),
+        String::from(expected_eth_balance),
+        "Actual EthBalance {} doesn't much with expected {}",
+        eth_balance,
+        expected_eth_balance
+    );
+    let token_balance = blockchain_interface
+        .get_token_balance(&wallet)
+        .unwrap_or_else(|_| panic!("Failed to retrieve token balance for {}", wallet));
+    assert_eq!(
+        token_balance,
+        web3::types::U256::from_dec_str(expected_token_balance).unwrap(),
+        "Actual TokenBalance {} doesn't match with expected {}",
+        token_balance,
+        expected_token_balance
+    );
 }
 
 fn deploy_smart_contract(wallet: &Wallet, web3: &Web3<Http>, chain: Chain) -> Address {

node/src/accountant/dao_utils.rs

@@ -9,7 +9,7 @@ use crate::database::db_initializer::{
     connection_or_panic, DbInitializationConfig, DbInitializerReal,
 };
 use crate::sub_lib::accountant::PaymentThresholds;
-use masq_lib::constants::WEIS_OF_GWEI;
+use masq_lib::constants::WEIS_IN_GWEI;
 use masq_lib::messages::{
     RangeQuery, TopRecordsConfig, TopRecordsOrdering, UiPayableAccount, UiReceivableAccount,
 };
@@ -211,7 +211,7 @@ impl<N: Copy + Display> CustomQuery<N> {
         .into_iter()
         .zip([min_amount, max_amount].into_iter())
         .flat_map(|(param_names, gwei_num)| {
-            let wei_num = i128::from(gwei_num) * WEIS_OF_GWEI;
+            let wei_num = i128::from(gwei_num) * WEIS_IN_GWEI;
             let big_int_divided = BigIntDivider::deconstruct(wei_num);
             Self::balance_constraint_as_integer_pair(param_names, big_int_divided)
         })
@@ -260,7 +260,7 @@ pub fn remap_payable_accounts(accounts: Vec<PayableAccount>) -> Vec<UiPayableAcc
             wallet: account.wallet.to_string(),
             age_s: to_age(account.last_paid_timestamp),
             balance_gwei: {
-                let gwei = (account.balance_wei / (WEIS_OF_GWEI as u128)) as u64;
+                let gwei = (account.balance_wei / (WEIS_IN_GWEI as u128)) as u64;
                 if gwei > 0 {
                     gwei
                 } else {
@@ -285,7 +285,7 @@ pub fn remap_receivable_accounts(accounts: Vec<ReceivableAccount>) -> Vec<UiRece
             wallet: account.wallet.to_string(),
             age_s: to_age(account.last_received_timestamp),
             balance_gwei:{
-                let gwei =  (account.balance_wei / (WEIS_OF_GWEI as i128)) as i64;
+                let gwei =  (account.balance_wei / (WEIS_IN_GWEI as i128)) as i64;
                 if gwei != 0 {gwei} else {panic!("Broken code: ReceivableAccount with balance \
                  between {} and 0 gwei passed through db query constraints; wallet: {}, balance: {}",
                         if account.balance_wei.is_positive() {"1"}else{"-1"},
@@ -759,7 +759,7 @@ mod tests {
             maturity_threshold_sec: 20,
             payment_grace_period_sec: 33,
             permanent_debt_allowed_gwei: 1,
-            debt_threshold_gwei: MASQ_TOTAL_SUPPLY * WEIS_OF_GWEI as u64,
+            debt_threshold_gwei: MASQ_TOTAL_SUPPLY * WEIS_IN_GWEI as u64,
             threshold_interval_sec: 1,
             unban_below_gwei: 0,
         };
@@ -775,7 +775,7 @@ mod tests {
             );
             slope * (payment_thresholds.maturity_threshold_sec + 1) as i128 + y_interception
         };
-        assert_eq!(check, WEIS_OF_GWEI)
+        assert_eq!(check, WEIS_IN_GWEI)
     }
 
     #[test]