From 00f4ddba68df6c159aa8b9b319ae8a998406fac3 Mon Sep 17 00:00:00 2001 From: lash Date: Wed, 8 Feb 2023 06:03:56 +0000 Subject: [PATCH] Remove growby method --- python/tests/test_growth.py | 36 ++++++++++++++++++------------------ solidity/Makefile | 8 ++++++-- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/python/tests/test_growth.py b/python/tests/test_growth.py index 9412e90..dafca13 100644 --- a/python/tests/test_growth.py +++ b/python/tests/test_growth.py @@ -28,23 +28,23 @@ testdir = os.path.dirname(__file__) class TestGrowth(TestDemurrageDefault): - def test_grow_by(self): - nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc) - c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) - - growth_factor = (1000000 + self.tax_level) / 1000000 - v = 1000000000 - o = c.grow_by(self.address, v, 1, sender_address=self.accounts[0]) - r = self.rpc.do(o) - g = c.parse_grow_by(r) - self.assertEqual(int(v * growth_factor), g) - - period = 10 - growth_factor = (1 + (self.tax_level) / 1000000) ** period - o = c.grow_by(self.address, v, period, sender_address=self.accounts[0]) - r = self.rpc.do(o) - g = c.parse_grow_by(r) - self.assertEqual(int(v * growth_factor), g) +# def test_grow_by(self): +# nonce_oracle = RPCNonceOracle(self.accounts[0], self.rpc) +# c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle) +# +# growth_factor = (1000000 + self.tax_level) / 1000000 +# v = 1000000000 +# o = c.grow_by(self.address, v, 1, sender_address=self.accounts[0]) +# r = self.rpc.do(o) +# g = c.parse_grow_by(r) +# self.assertEqual(int(v * growth_factor), g) +# +# period = 10 +# growth_factor = (1 + (self.tax_level) / 1000000) ** period +# o = c.grow_by(self.address, v, period, sender_address=self.accounts[0]) +# r = self.rpc.do(o) +# g = c.parse_grow_by(r) +# self.assertEqual(int(v * growth_factor), g) def test_decay_by(self): @@ -63,7 +63,7 @@ class TestGrowth(TestDemurrageDefault): o = c.decay_by(self.address, v, period, sender_address=self.accounts[0]) r = self.rpc.do(o) g = c.parse_decay_by(r) - self.assertEqual(int(v * growth_factor), g) + self.assertEqual(int(v * growth_factor), g) if __name__ == '__main__': diff --git a/solidity/Makefile b/solidity/Makefile index 15cf4e4..2ad8b50 100644 --- a/solidity/Makefile +++ b/solidity/Makefile @@ -32,11 +32,15 @@ test: all python ../python/tests/test_redistribution.py python ../python/tests/test_pure.py -install: all +#install: all +install: single_nocap #cp -v DemurrageToken*.{json,bin} ../python/erc20_demurrage_token/data/ - cp -v DemurrageTokenSingleNocap.{json,bin} ../python/erc20_demurrage_token/data/ + cp -v DemurrageTokenSingleNocap.json ../python/erc20_demurrage_token/data/ + cp -v DemurrageTokenSingleNocap.bin ../python/erc20_demurrage_token/data/ install-broken: all cp -v DemurrageToken*.{json,bin} ../python/erc20_demurrage_token/data/ + + .PHONY: test install