Add expiry implementation, after expire sink gets all

python/erc20_demurrage_token/token.py

@@ -25,6 +25,8 @@ from dexif import from_fixed
 
 # local imports
 from erc20_demurrage_token.data import data_dir
+from erc20_demurrage_token.seal import SealedContract
+from erc20_demurrage_token.expiry import ExpiryContract
 
 logg = logging.getLogger(__name__)
 
@@ -71,7 +73,7 @@ class DemurrageTokenSettings:
                 )
 
 
-class DemurrageToken(ERC20):
+class DemurrageToken(ERC20, SealedContract, ExpiryContract):
 
     __abi = {}
     __bytecode = {}
@@ -459,6 +461,8 @@ class DemurrageToken(ERC20):
         return tx
 
 
+
+
     def tax_level(self, contract_address, sender_address=ZERO_ADDRESS):
         return self.call_noarg('taxLevel', contract_address, sender_address=sender_address)
 

python/erc20_demurrage_token/unittest/base.py

@@ -92,7 +92,7 @@ class TestDemurrage(EthTesterCase):
             period = getattr(self, 'period')
         except AttributeError as e:
             pass
-        self.deployer = TestTokenDeploy(self.rpc, period=period)
+        self.deployer = TestTokenDeploy(self.rpc, period=period, sink_address=self.accounts[9])
         self.default_supply = self.deployer.default_supply
         self.default_supply_cap = self.deployer.default_supply_cap
         self.start_block = None