Remove redistribute calls on no redistribute sim

python/tests/base.py

@@ -163,51 +163,3 @@ class TestDemurrageCap(TestDemurrage):
         self.deploy(c, self.mode)
 
         logg.info('deployed with mode {}'.format(self.mode))
-
-
-
-class TestDemurrageReal(TestDemurrage):
-
-    def setUp(self):
-        super(TestDemurrage, self).setUp()
-
-        self.tax_level = int(0.000050105908373373*(10**40))
-        self.period = 10800
-        self.period_seconds = self.period * 60
-
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        self.settings = DemurrageTokenSettings()
-        self.settings.name = 'Foo Token'
-        self.settings.symbol = 'FOO'
-        self.settings.decimals = 6
-        self.settings.demurrage_level = self.tax_level
-        self.settings.period_minutes = 10800
-        self.settings.sink_address = self.accounts[9]
-        self.sink_address = self.settings.sink_address
-
-        o = block_latest()
-        self.start_block = self.rpc.do(o)
-        
-        o = block_by_number(self.start_block, include_tx=False)
-        r = self.rpc.do(o)
-
-        try:
-            self.start_time = int(r['timestamp'], 16)
-        except TypeError:
-            self.start_time = int(r['timestamp'])
-
-        self.default_supply = 1000000000000
-        self.default_supply_cap = int(self.default_supply * 10)
-
-        nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
-        c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
-
-        self.mode = os.environ.get('ERC20_DEMURRAGE_TOKEN_TEST_MODE')
-        if self.mode == None:
-            self.mode = 'MultiNocap'
-        logg.debug('executing test setup default mode {}'.format(self.mode))
-
-        self.deploy(c, self.mode)
-
-        logg.info('deployed with mode {}'.format(self.mode))
-

python/tests/test_redistribution.py

@@ -8,7 +8,10 @@ import logging
 from chainlib.eth.constant import ZERO_ADDRESS
 from chainlib.eth.nonce import RPCNonceOracle
 from chainlib.eth.tx import receipt
-from chainlib.eth.block import block_latest
+from chainlib.eth.block import (
+        block_latest,
+        block_by_number,
+        )
 from chainlib.eth.address import to_checksum_address
 from hexathon import (
         strip_0x,
@@ -54,6 +57,12 @@ class TestRedistribution(TestDemurrageDefault):
         self.assertEqual(r['status'], 1)
 
         self.backend.time_travel(self.start_time + self.period_seconds + 1)
+        
+        o = block_latest()
+        r = self.rpc.do(o)
+        o = block_by_number(r)
+        r = self.rpc.do(o)
+        self.assertEqual(r['timestamp'], self.start_time + self.period_seconds)
 
         (tx_hash, o) = c.change_period(self.address, self.accounts[1])
         r = self.rpc.do(o)