WIP: Fix rewards_v3 test

TODO: Add more checks for balances and percentages

Author: vihu

src/transactions/blockchain_txn.erl

@@ -147,7 +147,8 @@
     {blockchain_txn_add_subnetwork_v1, 38},
     {blockchain_txn_update_subnetwork_v1, 39},
     {blockchain_txn_subnetwork_rewards_v1, 40},
-    {blockchain_txn_token_redeem_v1, 41}
+    {blockchain_txn_token_redeem_v1, 41},
+    {blockchain_txn_rewards_v3, 42}
 ]).
 
 block_delay() ->

src/transactions/v3/blockchain_txn_rewards_v3.erl

@@ -557,7 +557,7 @@ treasury_rewards(#{
     securities_percent := SecuritiesPercent
 }) ->
     TreasuryPercent = 1 - (ConsensusPercent + SecuritiesPercent),
-    TreasuryReward = EpochReward * TreasuryPercent,
+    TreasuryReward = erlang:round(EpochReward * TreasuryPercent),
     %% Treasury gets the full percentage
     #{{owner, treasury, TreasuryPubkeyBin} => TreasuryReward}.
 

test/blockchain_rewards_v3_SUITE.erl

@@ -159,19 +159,23 @@ basic_test(Config) ->
     Start = 1,
     End = 30,
 
-    Vars = blockchain_txn_rewards_v3:get_reward_vars(Start, End, Ledger),
-    ct:pal("Vars: ~p", [Vars]),
+    %% Ensure that RewardsMD has the necessary keys
+    {ok, RewardsMD} = blockchain_txn_rewards_v3:calculate_rewards_md(Start, End, Chain),
+    [consensus_rewards, securities_rewards, treasury_rewards] = lists:sort(maps:keys(RewardsMD)),
 
-    Rewards = blockchain_txn_rewards_v3:calculate_rewards(Start, End, Chain),
-    ct:pal("Rewards: ~p", [Rewards]),
-
-    RewardsMD = blockchain_txn_rewards_v3:calculate_rewards_md(Start, End, Chain),
-    ct:pal("RewardsMD: ~p", [RewardsMD]),
+    %% Construct a rewards_v3 txn
+    {ok, Rewards} = blockchain_txn_rewards_v3:calculate_rewards(Start, End, Chain),
+    T = blockchain_txn_rewards_v3:new(Start, End, Rewards),
+    %% NOTE: Signing rewards txn is pointless
+    ok = blockchain_txn:is_valid(T, Chain),
 
-    %% TODO: Missing consensus rewards?
+    {ok, Block31} = test_utils:create_block(ConsensusMembers, [T]),
+    _ = blockchain_gossip_handler:add_block(Block31, Chain, self(), blockchain_swarm:tid()),
 
-    %% Construct a rewards_v3 txn
-    %% T = blockchain_txn_rewards_v3:new(1, 30, Rewards)
+    ?assertEqual({ok, blockchain_block:hash_block(Block31)}, blockchain:head_hash(Chain)),
+    ?assertEqual({ok, Block31}, blockchain:head_block(Chain)),
+    ?assertEqual({ok, 31}, blockchain:height(Chain)),
+    ?assertEqual({ok, Block31}, blockchain:get_block(31, Chain)),
 
     ok.
 
@@ -181,25 +185,26 @@ basic_test(Config) ->
 extra_vars(TestCase) ->
     #{secret := _TSec, public := TPub} = libp2p_crypto:generate_keys(ed25519),
     TPubkeyBin = libp2p_crypto:pubkey_to_bin(TPub),
-    ExistingVars = existing_reward_vars(TestCase),
+    ExistingVars = on_chain_vars(TestCase),
     NewVars = #{
         ?allowed_num_reward_server_keys => 1,
         ?token_version => 2,
         ?subnetwork_reward_per_block_limit => 10,
-        ?reward_version => 3,
+        ?reward_version => 7,
         ?treasury_pubkey_bin => TPubkeyBin
     },
     maps:merge(ExistingVars, NewVars).
 
-existing_reward_vars(_TestCase) ->
+on_chain_vars(_TestCase) ->
     #{
         ?monthly_reward => 250000000000000,
         ?securities_percent => 0.33,
         ?consensus_percent => 0.06,
         ?election_interval => 30,
         ?election_restart_interval => 5,
         ?block_time => 60000,
-        ?net_emissions_max_rate => 3424000000
+        ?net_emissions_max_rate => 3424000000,
+        ?election_version => 6
     }.
 
 token_allocations(_, Config) ->