fixed tests that were using incorrect value for min_bonded_dhx_daily and rewards_allowance_dhx_daily so not reducing remaining. fix by funding treasury in tests so rewards paid

Author: ltfschoen

pallets/mining/rewards-allowance/src/lib.rs

@@ -65,7 +65,9 @@ pub mod pallet {
         },
     };
 
-    pub const default_bonded_amount: u128 = 25_133_000_000_000_000_000_000u128;
+    // this is only a default for test purposes and fallback.
+    // set this to 0u128 in production
+    pub const default_bonded_amount_u128: u128 = 25_133_000_000_000_000_000_000u128;
 
     // type BalanceOf<T> = <T as pallet_balances::Config>::Balance;
     type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
@@ -786,7 +788,7 @@ pub mod pallet {
                 // half of 5000 DHX daily allowance (of 2500 DHX), but in that case we split the rewards
                 // (i.e. 25,133 DHX locked at 10:1 gives 2513 DHX reward)
 
-                let mut locks_first_amount_as_u128 = default_bonded_amount.clone();
+                let mut locks_first_amount_as_u128 = default_bonded_amount_u128.clone();
                 let locked_vec = <pallet_balances::Pallet<T>>::locks(miner.clone()).into_inner();
                 if locked_vec.len() != 0 {
                     // println!("locked_vec: {:?}", locked_vec);
@@ -1277,6 +1279,9 @@ pub mod pallet {
                 // we could just divide both numbers by 1000000000000000000, so we'd have say 5000 and 1 instead,
                 // since we're just using these values to get a multiplier output.
 
+                println!("000 {:?}", rewards_allowance_dhx_daily_u128);
+                println!("001 {:?}", rewards_aggregated_dhx_daily_as_u128);
+
                 let mut manageable_rewards_allowance_dhx_daily_u128 = 0u128;
                 if let Some(_manageable_rewards_allowance_dhx_daily_u128) =
                     rewards_allowance_dhx_daily_u128.clone().checked_div(1000000000000000000u128) {
@@ -1328,7 +1333,7 @@ pub mod pallet {
                 }
             }
             log::info!("distribution_multiplier_for_day_fixed128 {:#?}", distribution_multiplier_for_day_fixed128);
-            // println!("[multiplier] block: {:#?}, miner: {:#?}, date_start: {:#?} distribution_multiplier_for_day_fixed128: {:#?}", _n, miner_count, start_of_requested_date_millis, distribution_multiplier_for_day_fixed128);
+            println!("[multiplier] block: {:#?}, miner: {:#?}, date_start: {:#?} distribution_multiplier_for_day_fixed128: {:#?}", _n, miner_count, start_of_requested_date_millis, distribution_multiplier_for_day_fixed128);
 
             // Initialise outside the loop as we need this value after the loop after we finish iterating through all the miners
             let mut rewards_allowance_dhx_remaining_today_as_u128 = 0u128;
@@ -1374,6 +1379,7 @@ pub mod pallet {
                     continue;
                 }
                 log::info!("daily_reward_for_miner_as_u128: {:?}", daily_reward_for_miner_as_u128.clone());
+                println!("0 {:?}", daily_reward_for_miner_as_u128);
 
                 let mut manageable_daily_reward_for_miner_as_u128 = 0u128;
                 if let Some(_manageable_daily_reward_for_miner_as_u128) =
@@ -1383,6 +1389,7 @@ pub mod pallet {
                     log::error!("Unable to divide daily_reward_for_miner_as_u128 to make it smaller");
                     return 0;
                 }
+                println!("1 {:?}", manageable_daily_reward_for_miner_as_u128);
 
                 // Multiply, handling overflow
                 // TODO - probably have to initialise below proportion_of_daily_reward_for_miner_fixed128 to 0u128,
@@ -1402,7 +1409,7 @@ pub mod pallet {
                     }
                 }
                 log::info!("proportion_of_daily_reward_for_miner_fixed128: {:?}", proportion_of_daily_reward_for_miner_fixed128.clone());
-
+                println!("2 {:?}", proportion_of_daily_reward_for_miner_fixed128);
                 // round down to nearest integer. we need to round down, because if we round up then if there are
                 // 3x registered miners with 5000 DHX rewards allowance per day then they would each get 1667 rewards,
                 // but there would only be 1666 remaining after the first two, so the last one would miss out.
@@ -1419,7 +1426,7 @@ pub mod pallet {
                     return 0;
                 }
 
-                // println!("[rewards] block: {:#?}, miner: {:#?}, date_start: {:#?} restored_proportion_of_daily_reward_for_miner_u128: {:#?}", _n, miner_count, start_of_requested_date_millis, restored_proportion_of_daily_reward_for_miner_u128);
+                println!("[rewards] block: {:#?}, miner: {:#?}, date_start: {:#?} restored_proportion_of_daily_reward_for_miner_u128: {:#?}", _n, miner_count, start_of_requested_date_millis, restored_proportion_of_daily_reward_for_miner_u128);
 
                 let treasury_account_id: T::AccountId = <pallet_treasury::Pallet<T>>::account_id();
                 let max_payout = pallet_balances::Pallet::<T>::usable_balance(treasury_account_id.clone());
@@ -1467,6 +1474,9 @@ pub mod pallet {
                     return 0;
                 }
 
+                println!("[prepared-for-payment] block: {:#?}, miner: {:#?}, date_start: {:#?} max payout: {:#?}, rewards remaining today {:?}, restored_proportion_of_daily_reward_for_miner_u128 {:?}",
+                    _n, miner_count, start_of_requested_date_millis, max_payout_as_u128, rewards_allowance_dhx_remaining_today_as_u128, restored_proportion_of_daily_reward_for_miner_u128);
+
                 // check if miner's reward is less than or equal to: rewards_allowance_dhx_daily_remaining
                 if restored_proportion_of_daily_reward_for_miner_u128.clone() > 0u128 &&
                     rewards_allowance_dhx_remaining_today_as_u128.clone() >= restored_proportion_of_daily_reward_for_miner_u128.clone() &&
@@ -1529,7 +1539,7 @@ pub mod pallet {
                         new_rewards_allowance_dhx_remaining_today.clone(),
                     );
 
-                    // println!("[paid] block: {:#?}, miner: {:#?}, date_start: {:#?} new_rewards_allowance_dhx_remaining_today: {:#?}", _n, miner_count, start_of_requested_date_millis, new_rewards_allowance_dhx_remaining_today);
+                    println!("[paid] block: {:#?}, miner: {:#?}, date_start: {:#?} new_rewards_allowance_dhx_remaining_today: {:#?}", _n, miner_count, start_of_requested_date_millis, new_rewards_allowance_dhx_remaining_today);
 
                     // emit event with reward payment history rather than bloating storage
                     Self::deposit_event(Event::TransferredRewardsAllowanceDHXToMinerForDate(

pallets/mining/rewards-allowance/src/mock.rs

@@ -444,8 +444,8 @@ impl MiningRewardsAllowanceConfig for Test {
 pub type SysEvent = frame_system::Event<Test>;
 pub type DemocracyEvent = pallet_democracy::Event<Test>;
 
-pub const INIT_DAO_BALANCE: u128 = 30_000_000_000_000_000_000_000_000u128;
-pub const TOTAL_SUPPLY: u128 = 100_000_000_000_000_000_000_000_000u128;
+pub const INIT_DAO_BALANCE_DHX: u128 = 30_000_000_000_000_000_000_000_000u128;
+pub const TOTAL_SUPPLY_DHX: u128 = 100_000_000_000_000_000_000_000_000u128;
 pub const TEN_DHX: u128 = 10_000_000_000_000_000_000u128;
 
 // This function basically just builds a genesis storage key/value store according to
@@ -454,11 +454,12 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
     let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
     pallet_balances::GenesisConfig::<Test> {
         balances: vec![
-            (0, INIT_DAO_BALANCE),
+            (0, TEN_DHX),
             (1, TEN_DHX),
             (2, TEN_DHX),
             (3, TEN_DHX),
-            (100, TOTAL_SUPPLY)],
+            (100, TOTAL_SUPPLY_DHX),
+        ],
     }
     .assimilate_storage(&mut t)
     .unwrap();