Remove minter alias in contract

This commit is contained in:
lash
2023-02-12 08:31:08 +00:00
parent 4e6e5300f7
commit 7982dbae97
6 changed files with 26 additions and 13 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+13 -2
View File
@@ -146,9 +146,14 @@ class DemurrageToken(ERC20, SealedContract, ExpiryContract):
return tx
# backwards compatibility
def add_minter(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
return self.add_writer(contract_address, sender_address, address, tx_format=tx_format)
def add_writer(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
enc = ABIContractEncoder()
enc.method('addMinter')
enc.method('addWriter')
enc.typ(ABIContractType.ADDRESS)
enc.address(address)
data = enc.get()
@@ -169,9 +174,15 @@ class DemurrageToken(ERC20, SealedContract, ExpiryContract):
tx = self.finalize(tx, tx_format)
return tx
# backwards compatibility
def remove_minter(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
return self.delete_writer(contract_address, sender_address, address, tx_format=tx_format)
def delete_writer(self, contract_address, sender_address, address, tx_format=TxFormat.JSONRPC):
enc = ABIContractEncoder()
enc.method('removeMinter')
enc.method('deleteWriter')
enc.typ(ABIContractType.ADDRESS)
enc.address(address)
data = enc.get()
@@ -77,6 +77,12 @@ class TestTokenDeploy:
r = rpc.do(o)
self.start_time = r['timestamp']
(tx_hash, o) = interface.add_writer(self.address, deployer_address, deployer_address)
r = rpc.do(o)
o = receipt(tx_hash)
r = rpc.do(o)
assert r['status'] == 1
return self.address
+3
View File
@@ -27,6 +27,9 @@ class TestAmounts(TestDemurrageDefault):
c = DemurrageToken(self.chain_spec, signer=self.signer, nonce_oracle=nonce_oracle)
(tx_hash, o) = c.mint_to(self.address, self.accounts[0], self.accounts[1], 1000)
r = self.rpc.do(o)
o = receipt(tx_hash)
r = self.rpc.do(o)
self.assertEqual(r['status'], 1)
self.backend.time_travel(self.start_time + self.period_seconds)