From cc1a84f8189fbf24af312f2795fa9aba970aec54 Mon Sep 17 00:00:00 2001 From: lash Date: Fri, 27 May 2022 13:22:25 +0000 Subject: [PATCH] Add catch-up period test --- python/tests/test_redistribution_single.py | 50 ++++++++++++++++++++++ python/tests/test_redistribution_unit.py | 4 -- 2 files changed, 50 insertions(+), 4 deletions(-) diff --git a/python/tests/test_redistribution_single.py b/python/tests/test_redistribution_single.py index 28d2d67..a980d9b 100644 --- a/python/tests/test_redistribution_single.py +++ b/python/tests/test_redistribution_single.py @@ -77,6 +77,56 @@ class TestRedistribution(TestDemurrageDefault): self.assert_within_lower(balance_minter + balance_sink, supply, 0.001) + + def test_redistribution_catchup_periods(self): + nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc) + c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) + + demurrage = (1 - (self.tax_level / 1000000)) * (10**28) + supply = self.default_supply + + (tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[0], supply) + self.rpc.do(o) + + self.backend.time_travel(self.start_time + (self.period_seconds * 10)) + + for i in range(1, 11): + logg.debug('checking period {}'.format(i)) + + (tx_hash, o) = c.change_period(self.address, self.accounts[0]) + self.rpc.do(o) + o = receipt(tx_hash) + r = self.rpc.do(o) + self.assertEqual(r['status'], 1) + + i = 10 + o = c.redistributions(self.address, i, sender_address=self.accounts[0]) + redistribution = self.rpc.do(o) + + o = c.to_redistribution_demurrage_modifier(self.address, redistribution, sender_address=self.accounts[0]) + r = self.rpc.do(o) + demurrage = c.parse_to_redistribution_item(r) + + o = c.redistributions(self.address, i-1, sender_address=self.accounts[0]) + redistribution = self.rpc.do(o) + + o = c.to_redistribution_demurrage_modifier(self.address, redistribution, sender_address=self.accounts[0]) + r = self.rpc.do(o) + demurrage_previous = c.parse_to_redistribution_item(r) + + o = c.balance_of(self.address, self.sink_address, sender_address=self.accounts[0]) + r = self.rpc.do(o) + balance_sink = c.parse_balance(r) + + o = c.balance_of(self.address, self.accounts[0], sender_address=self.accounts[0]) + r = self.rpc.do(o) + balance_minter = c.parse_balance(r) + + logg.debug('testing sink {} mint {} adds up to supply {} with demurrage between {} and {}'.format(balance_sink, balance_minter, supply, demurrage_previous, demurrage)) + + self.assert_within_lower(balance_minter + balance_sink, supply, 0.001) + + # def test_redistribution_boundaries(self): # nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc) # c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) diff --git a/python/tests/test_redistribution_unit.py b/python/tests/test_redistribution_unit.py index c11bdfa..fdd2f9c 100644 --- a/python/tests/test_redistribution_unit.py +++ b/python/tests/test_redistribution_unit.py @@ -62,7 +62,6 @@ class TestRedistribution(TestDemurrageUnit): o = c.get_distribution_from_redistribution(self.address, redistribution, self.accounts[0]) r = self.rpc.do(o) distribution = c.parse_get_distribution(r) - #expected_distribution = self.default_supply * (((self.tax_level * 1.33) - self.tax_level) / 100000) expected_distribution = (self.default_supply * self.tax_level) / 100000 logg.debug('distribution {} supply {}'.format(distribution, self.default_supply)) self.assert_within_lower(distribution, expected_distribution, 1000) @@ -184,9 +183,6 @@ class TestRedistribution(TestDemurrageUnit): o = c.to_redistribution_demurrage_modifier(self.address, redistribution, sender_address=self.accounts[0]) r = self.rpc.do(o) demurrage = c.parse_to_redistribution_item(r) -# o = c.demurrage_amount(self.address, sender_address=self.accounts[0]) -# r = self.rpc.do(o) -# demurrage = c.parse_demurrage_amount(r) logg.debug('\nrediistribution {}\ndemurrage {}\nsupply {}'.format(redistribution, demurrage, supply)) expected_balance = int(supply * (self.tax_level / 1000000))