Rehabilitate change period

python/erc20_demurrage_token/token.py

@@ -29,6 +29,28 @@ from erc20_demurrage_token.fixed import from_fixed
 logg = logging.getLogger(__name__)
 
 
+class DemurrageRedistribution:
+    
+    def __init__(self, v):
+        d = ABIContractDecoder()
+        v = strip_0x(v)
+        d.typ(ABIContractType.UINT256)
+        d.typ(ABIContractType.UINT256)
+        d.typ(ABIContractType.BYTES32)
+        d.val(v[:64])
+        d.val(v[64:128])
+        d.val(v[128:192])
+        r = d.decode()
+
+        self.period = r[0]
+        self.value = r[1]
+        self.demurrage = from_fixed(r[2])
+
+
+    def __str__(self):
+        return 'period {} value {} demurrage {}'.format(self.period, self.value, self.demurrage)
+
+
 class DemurrageTokenSettings:
 
     def __init__(self):
@@ -315,7 +337,7 @@ class DemurrageToken(ERC20):
         enc = ABIContractEncoder()
         enc.method('toRedistributionPeriod')
         v = strip_0x(redistribution)
-        enc.typ_literal('(uint32,uint72,uint104)')
+        enc.typ_literal('(uint32,uint72,uint64)')
         enc.bytes32(v[:64])
         enc.bytes32(v[64:128])
         enc.bytes32(v[128:192])
@@ -356,7 +378,7 @@ class DemurrageToken(ERC20):
         enc = ABIContractEncoder()
         enc.method('toRedistributionSupply')
         v = strip_0x(redistribution)
-        enc.typ_literal('(uint32,uint72,uint104)')
+        enc.typ_literal('(uint32,uint72,uint64)')
         enc.bytes32(v[:64])
         enc.bytes32(v[64:128])
         enc.bytes32(v[128:192])
@@ -376,7 +398,7 @@ class DemurrageToken(ERC20):
         enc = ABIContractEncoder()
         enc.method('toRedistributionDemurrageModifier')
         v = strip_0x(redistribution)
-        enc.typ_literal('(uint32,uint72,uint104)')
+        enc.typ_literal('(uint32,uint72,uint64)')
         enc.bytes32(v[:64])
         enc.bytes32(v[64:128])
         enc.bytes32(v[128:192])
@@ -580,16 +602,18 @@ class DemurrageToken(ERC20):
     
     @classmethod
     def parse_redistributions(self, v):
-        d = ABIContractDecoder()
-        v = strip_0x(v)
-        d.typ(ABIContractType.BYTES32)
-        d.typ(ABIContractType.BYTES32)
-        d.typ(ABIContractType.BYTES32)
-        d.val(v[:64])
-        d.val(v[64:128])
-        d.val(v[128:192])
-        r = d.decode()
-        return ''.join(r)
+        return strip_0x(v)
+        #return DemurrageRedistribution(v)
+#        d = ABIContractDecoder()
+#        v = strip_0x(v)
+#        d.typ(ABIContractType.BYTES32)
+#        d.typ(ABIContractType.BYTES32)
+#        d.typ(ABIContractType.BYTES32)
+#        d.val(v[:64])
+#        d.val(v[64:128])
+#        d.val(v[128:192])
+#        r = d.decode()
+#        return ''.join(r)
 
 
     @classmethod
@@ -640,3 +664,4 @@ class DemurrageToken(ERC20):
     @classmethod
     def parse_total_burned(self, v):
         return abi_decode_single(ABIContractType.UINT256, v)
+

python/tests/test_period.py

@@ -19,9 +19,10 @@ from chainlib.eth.contract import (
 
 # local imports
 from erc20_demurrage_token import DemurrageToken
+from erc20_demurrage_token.token import DemurrageRedistribution
 
 # test imports
-from erc20_demurrage_token.unittest.base import TestDemurrageDefault
+from erc20_demurrage_token.unittest import TestDemurrageDefault
 
 logging.basicConfig(level=logging.DEBUG)
 logg = logging.getLogger()
@@ -57,15 +58,6 @@ class TestPeriod(TestDemurrageDefault):
         period = c.parse_to_redistribution_period(r)
         self.assertEqual(2, period)
 
-        o = c.redistributions(self.address, 1, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        redistribution = c.parse_redistributions(r)
-
-        o = c.to_redistribution_period(self.address, redistribution, sender_address=self.accounts[0])
-        r = self.rpc.do(o)
-        period = c.parse_to_redistribution_period(r)
-        self.assertEqual(2, period)
-
         o = c.actual_period(self.address, sender_address=self.accounts[0])
         r = self.rpc.do(o)
         period = c.parse_actual_period(r)
@@ -74,6 +66,7 @@ class TestPeriod(TestDemurrageDefault):
         o = c.to_redistribution_demurrage_modifier(self.address, redistribution, sender_address=self.accounts[0])
         r = self.rpc.do(o)
         period = c.parse_to_redistribution_item(r)
+        redistro = DemurrageRedistribution(redistribution)
 
         # allow test code float rounding error to billionth
         modifier = (1 - (self.tax_level / 1000000)) ** (self.period_seconds / 60)

python/tests/test_single.py

@@ -18,7 +18,8 @@ from hexathon import (
 from erc20_demurrage_token import DemurrageToken
 
 # test imports
-from erc20_demurrage_token.unittest.base import TestDemurrageSingle
+from erc20_demurrage_token.unittest import TestDemurrageDefault
+from erc20_demurrage_token.fixed import to_fixed
 
 logging.basicConfig(level=logging.DEBUG)
 logg = logging.getLogger()
@@ -26,11 +27,9 @@ logg = logging.getLogger()
 testdir = os.path.dirname(__file__)
 
 
-class TestRedistributionSingle(TestDemurrageSingle):
-
+class TestRedistributionSingle(TestDemurrageDefault):
 
     def test_single_even_if_multiple(self):
-
         mint_amount = 100000000
 
         nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc)
@@ -64,7 +63,7 @@ class TestRedistributionSingle(TestDemurrageSingle):
         r = self.rpc.do(o)
         self.assertEqual(r['status'], 1)
 
-        tax_modifier = (1 - (self.tax_level / 1000000)) ** 10
+        tax_modifier = 0.98
         o = c.balance_of(self.address, self.accounts[1], sender_address=self.accounts[0])
         r = self.rpc.do(o)
         balance = c.parse_balance(r)