Merge pull request #815 from mkoura/dbsync_reward_enhancements

Minor enhancements to rewards checks in db-sync
IntersectMBO · Dec 3, 2021 · 22f48bb · 22f48bb
2 parents 0bc6c27 + 6647c6d
commit 22f48bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/cardano_node_tests/tests/test_delegation.py b/cardano_node_tests/tests/test_delegation.py
@@ -447,7 +447,7 @@ def test_undelegate(
             not stake_addr_info.delegation
         ), f"Stake address is still delegated: {stake_addr_info}"
 
-        cluster.wait_for_new_epoch(padding_seconds=10)
+        cluster.wait_for_new_epoch(padding_seconds=20)
         this_epoch = cluster.get_epoch()
         assert cluster.get_stake_addr_info(
             delegation_out.pool_user.stake.address
@@ -465,7 +465,7 @@ def test_undelegate(
             assert db_rewards
             db_reward_epochs = sorted(r.spendable_epoch for r in db_rewards.rewards)
             assert db_reward_epochs[0] == init_epoch + 4
-            assert db_reward_epochs[-1] == this_epoch
+            assert this_epoch in db_reward_epochs
 
     @allure.link(helpers.get_vcs_link())
     @pytest.mark.parametrize(

diff --git a/cardano_node_tests/tests/test_staking.py b/cardano_node_tests/tests/test_staking.py
@@ -180,7 +180,7 @@ def _dbsync_check_rewards(
     db_pool_ids_dict = {
         r.spendable_epoch: r.pool_id
         for r in reward_db_record.rewards
-        if r.pool_id and pool_first_epoch <= r.spendable_epoch <= epoch_to
+        if r.pool_id and r.type == "member" and pool_first_epoch <= r.spendable_epoch <= epoch_to
     }
     assert pool_ids_dict == db_pool_ids_dict