WIP: Prune more unnecessary reward related vars

Author: vihu

src/transactions/v3/blockchain_txn_rewards_v3.erl

@@ -251,127 +251,28 @@ new_reward(Account, Amount) ->
 get_reward_vars(Start, End, Ledger) ->
     {ok, MonthlyReward} = blockchain:config(?monthly_reward, Ledger),
     {ok, SecuritiesPercent} = blockchain:config(?securities_percent, Ledger),
-    {ok, PocChallengeesPercent} = blockchain:config(?poc_challengees_percent, Ledger),
-    {ok, PocChallengersPercent} = blockchain:config(?poc_challengers_percent, Ledger),
-    {ok, PocWitnessesPercent} = blockchain:config(?poc_witnesses_percent, Ledger),
     {ok, ConsensusPercent} = blockchain:config(?consensus_percent, Ledger),
-    {ok, OraclePrice} = blockchain_ledger_v1:current_oracle_price(Ledger),
-    DCPercent =
-        case blockchain:config(?dc_percent, Ledger) of
-            {ok, R1} ->
-                R1;
-            _ ->
-                0
-        end,
-    SCGrace =
-        case blockchain:config(?sc_grace_blocks, Ledger) of
-            {ok, R2} ->
-                R2;
-            _ ->
-                0
-        end,
-    SCVersion =
-        case blockchain:config(?sc_version, Ledger) of
-            {ok, R3} ->
-                R3;
-            _ ->
-                1
-        end,
-    SCDisputeStrategyVersion =
-        case blockchain:config(?sc_dispute_strategy_version, Ledger) of
-            {ok, SCDV} -> SCDV;
-            _ -> 0
-        end,
-    POCVersion =
-        case blockchain:config(?poc_version, Ledger) of
-            {ok, V} -> V;
-            _ -> 1
-        end,
-    RewardVersion =
-        case blockchain:config(?reward_version, Ledger) of
-            {ok, R4} -> R4;
-            _ -> 1
-        end,
-
-    WitnessRedundancy =
-        case blockchain:config(?witness_redundancy, Ledger) of
-            {ok, WR} -> WR;
-            _ -> undefined
-        end,
-
-    DecayRate =
-        case blockchain:config(?poc_reward_decay_rate, Ledger) of
-            {ok, R} -> R;
-            _ -> undefined
-        end,
-
-    DensityTgtRes =
-        case blockchain:config(?density_tgt_res, Ledger) of
-            {ok, D} -> D;
-            _ -> undefined
-        end,
-
-    HIP15TxRewardUnitCap =
-        case blockchain:config(?hip15_tx_reward_unit_cap, Ledger) of
-            {ok, Val} -> Val;
-            _ -> undefined
-        end,
-
     {ok, ElectionInterval} = blockchain:config(?election_interval, Ledger),
     {ok, ElectionRestartInterval} = blockchain:config(?election_restart_interval, Ledger),
     {ok, BlockTime} = blockchain:config(?block_time, Ledger),
-
-    WitnessRewardDecayRate =
-        case blockchain:config(?witness_reward_decay_rate, Ledger) of
-            {ok, Dec} -> Dec;
-            _ -> undefined
-        end,
-
-    WitnessRewardDecayExclusion =
-        case blockchain:config(?witness_reward_decay_exclusion, Ledger) of
-            {ok, Exc} -> Exc;
-            _ -> undefined
-        end,
-
-    PocChallengerType =
-        case blockchain:config(?poc_challenger_type, Ledger) of
-            {ok, validator} -> validator;
-            _ -> gateway
-        end,
+    {ok, RewardVersion} = blockchain:config(?reward_version, Ledger),
+    {ok, NetEmissionsMaxRate} = blockchain:config(?net_emissions_max_rate, Ledger),
+    {ok, HNTBurned} = blockchain_ledger_v1:hnt_burned(Ledger),
+    {ok, NetOverage} = blockchain_ledger_v1:net_overage(Ledger),
 
     TreasuryPubkeyBin =
         case blockchain:config(?treasury_pubkey_bin, Ledger) of
             {ok, TPB} -> TPB;
             _ -> undefined
         end,
 
-    {ok, NetEmissionsMaxRate} = blockchain:config(?net_emissions_max_rate, Ledger),
-    {ok, HNTBurned} = blockchain_ledger_v1:hnt_burned(Ledger),
-    {ok, NetOverage} = blockchain_ledger_v1:net_overage(Ledger),
-
     Vars0 = #{
         monthly_reward => MonthlyReward,
-        oracle_price => OraclePrice,
         securities_percent => SecuritiesPercent,
-        poc_challengees_percent => PocChallengeesPercent,
-        poc_challengers_percent => PocChallengersPercent,
-        poc_witnesses_percent => PocWitnessesPercent,
         consensus_percent => ConsensusPercent,
-        dc_percent => DCPercent,
-        poc_challenger_type => PocChallengerType,
-        sc_grace_blocks => SCGrace,
-        sc_version => SCVersion,
-        sc_dispute_strategy_version => SCDisputeStrategyVersion,
-        poc_version => POCVersion,
         reward_version => RewardVersion,
-        witness_redundancy => WitnessRedundancy,
-        poc_reward_decay_rate => DecayRate,
-        density_tgt_res => DensityTgtRes,
-        hip15_tx_reward_unit_cap => HIP15TxRewardUnitCap,
         election_interval => ElectionInterval,
         election_restart_interval => ElectionRestartInterval,
-        witness_reward_decay_rate => WitnessRewardDecayRate,
-        witness_reward_decay_exclusion => WitnessRewardDecayExclusion,
         block_time => BlockTime,
         net_emissions_max_rate => NetEmissionsMaxRate,
         hnt_burned => HNTBurned,