Skip to content

Commit

Permalink
Zerocoin code removal (#995)
Browse files Browse the repository at this point in the history
* Removing Zerocoin code

* Fixing tests and changing chainparams for regtest

* Review comments resolved

* More review comments applied

* Fixing rpc test

* Review comments applied
  • Loading branch information
levonpetrosyan93 committed Apr 25, 2021
1 parent c2ae085 commit 6f2fa2b
Show file tree
Hide file tree
Showing 186 changed files with 664 additions and 16,272 deletions.
5 changes: 0 additions & 5 deletions qa/pull-tester/rpc-tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -177,15 +177,10 @@
'notifications.py',

# Firo-specific tests
'wallet_dumpnonhd.py',
'wallet_dumpsigma.py',
'wallet_dumpzerocoin.py',
'transactions_verification_after_restart.py',
'sigma_remint_lockedwallet.py',
'sigma_zapwalletmints.py',
'sigma_nonhd_wallet.py',
'sigma_remint.py',
'sigma_remint_validation.py',
'sigma_meetspend.py',
'sigma_listsigmamints_validation.py',
'sigma_listsigmaspends_validation.py',
Expand Down
10 changes: 0 additions & 10 deletions qa/rpc-tests/elysium_create_denomination.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,9 @@ def run_test(self):
# create non-sigma token
self.nodes[0].elysium_sendissuancefixed(self.addrs[0], 1, 1, 0, '', '', 'Normal Token', '', '', '1000000')
self.nodes[0].generate(1)

self.sync_all()

# test feature check
assert_raises_message(
JSONRPCException,
'Sigma feature is not activated yet',
self.nodes[0].elysium_sendcreatedenomination, self.addrs[0], 3, '1'
)

# create sigma token
self.nodes[0].generate(300) # sigma on regtest start at block 500

self.nodes[0].elysium_sendissuancefixed(self.addrs[0], 1, 2, 0, '', '', 'Sigma Token', '', '', '1000000', 1)
self.nodes[0].generate(1)

Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_issuance_fixed.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def run_test(self):

# create properties
tx1 = self.nodes[0].elysium_sendissuancefixed(self.addrs[0], 1, 1, 0, 'main', 'indivisible', 'token1', 'http://token1.com', 'data1', '1')
self.nodes[0].generate(300) # we need 500 blocks in order to specify sigma flag
self.nodes[0].generate(150) # we need 100 blocks in order to specify sigma flag
self.sync_all()

tx2 = self.nodes[1].elysium_sendissuancefixed(self.addrs[1], 1, 2, 0, 'main', 'divisible', 'token2', 'http://token2.com', 'data2', '1.1', 0)
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_issuance_managed.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def run_test(self):

# create properties
tx1 = self.nodes[0].elysium_sendissuancemanaged(self.addrs[0], 1, 1, 0, 'main', 'indivisible', 'token1', 'http://token1.com', 'data1')
self.nodes[0].generate(300) # we need 500 blocks in order to specify sigma flag
self.nodes[0].generate(150) # we need 100 blocks in order to specify sigma flag
self.sync_all()

tx2 = self.nodes[1].elysium_sendissuancemanaged(self.addrs[1], 1, 2, 0, 'main', 'divisible', 'token2', 'http://token2.com', 'data2', 0)
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_property_creation_fee.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def test_insufficient(self, balance = 1, ecosystem = 1, amount = None):
def run_test(self):
super().run_test()

creation_fee_start_block = 500
creation_fee_start_block = 250

# before creation fee is activated, all properies type should be able to create with low fee.
self.test(ecosystem = 1)
Expand Down
4 changes: 2 additions & 2 deletions qa/rpc-tests/elysium_sendmint.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ class ElysiumSendMintTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_start_block = 500
sigma_start_block = 260

self.nodes[0].generatetoaddress(100, self.addrs[0])
self.nodes[0].generatetoaddress(30, self.addrs[0])
self.nodes[0].generate(sigma_start_block - self.nodes[0].getblockcount())

assert_equal(sigma_start_block, self.nodes[0].getblockcount())
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_sendmint_wallet_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class ElysiumSendMintWalletEncrytionTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_start_block = 500
sigma_start_block = 150

self.nodes[0].generatetoaddress(100, self.addrs[0])
self.nodes[0].generate(sigma_start_block - self.nodes[0].getblockcount())
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_sendspend.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class ElysiumSendSpendTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_starting_block = 550
sigma_starting_block = 210

self.nodes[0].generatetoaddress(sigma_starting_block - self.nodes[0].getblockcount(), self.addrs[0])
self.sync_all()
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_sendspend_wallet_encryption.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ElysiumSendSpendWalletEncryptionTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_start_block = 550
sigma_start_block = 150
passphase = "1234"

owner = self.addrs[0]
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_sigma_reindex.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ElysiumSigmaReindexTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_start_block = 550
sigma_start_block = 150
self.nodes[0].generate(sigma_start_block - self.nodes[0].getblockcount())

# generate mints to spend
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_sigma_reorg.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class ElysiumSigmaReorgTest(ElysiumTestFramework):
def run_test(self):
super().run_test()

sigma_start_block = 550
sigma_start_block = 150
self.nodes[0].generate(sigma_start_block - self.nodes[0].getblockcount())

# generate mints to spend
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/elysium_walletrecovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def run_test(self):
# generate sigma property
owner = self.addrs[0]

sigma_start_block = 550
sigma_start_block = 150
self.nodes[0].generatetoaddress(
sigma_start_block - self.nodes[0].getblockcount(),
owner)
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/hdmint_mempool_zap.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ def hdmint_zap(self, configuration):
def run_test(self):
getcontext().prec = 6
self.sync_all()
self.nodes[0].generate(401)

zapwal1 = ["-zapwallettxes=1"]
self.hdmint_zap(zapwal1)

Expand Down
3 changes: 1 addition & 2 deletions qa/rpc-tests/lelantus_mint.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ def __init__(self):
self.setup_clean_chain = False

def run_test(self):
activation_block = 1000
activation_block = 400

self.nodes[0].generate(200)
assert_raises_message(
JSONRPCException,
"Lelantus is not activated yet",
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/lelantus_mintspend.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self):
def run_test(self):
# Decimal formating: 6 digits for balance will be enought 000.000
getcontext().prec = 6
self.nodes[0].generate(1001)
self.nodes[0].generate(401)
self.sync_all()

start_bal = self.nodes[0].getbalance()
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/lelantus_setmintstatus_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def setup_nodes(self):
return start_nodes(self.num_nodes, self.options.tmpdir)

def run_test(self):
self.nodes[0].generate(1000)
self.nodes[0].generate(400)
self.sync_all()

txid = self.nodes[0].mintlelantus(10)
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/lelantus_spend_gettransaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def setup_nodes(self):
return start_nodes(self.num_nodes, self.options.tmpdir)

def run_test(self):
self.nodes[0].generate(1001)
self.nodes[0].generate(401)
self.sync_all()

# get a watch only address
Expand Down
3 changes: 2 additions & 1 deletion qa/rpc-tests/sigma_blocklimit.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ def setup_nodes(self):

def run_test(self):
getcontext().prec = 6
self.nodes[0].generate(400)
self.nodes[0].generate(100)
self.sync_all()

self.nodes[0].mint(1000)
self.nodes[0].generate(10)
self.sync_all()
Expand Down
1 change: 0 additions & 1 deletion qa/rpc-tests/sigma_listsigmamints_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def setup_nodes(self):

def run_test(self):
getcontext().prec = 6
self.nodes[0].generate(400)
self.sync_all()

assert not self.nodes[0].listsigmamints(False), 'List sigma own mints should be empty.'
Expand Down
9 changes: 4 additions & 5 deletions qa/rpc-tests/sigma_listsigmapubcoins_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
('10', False), ('10', True), ('100', False), ('100', False), ('25', False), ('25', False)],

'25': [('0.05', False), ('0.05', True), ('0.05', True), ('0.05', True), ('0.1', False), ('0.1', False),
('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False),
('0.1', True), ('0.1', True), ('0.5', False), ('0.5', True), ('0.5', True), ('1', True), ('1', True),
('10', False), ('10', True), ('100', False), ('100', False), ('25', False), ('25', True)],
('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False),
('0.1', True), ('0.1', True), ('0.5', False), ('0.5', True), ('0.5', True), ('1', True), ('1', True),
('10', False), ('10', True), ('100', False), ('100', False), ('25', False), ('25', True)],

'100': [('0.05', True), ('0.05', True), ('0.05', True), ('0.05', True), ('0.1', False), ('0.1', False),
('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False), ('0.1', False),
Expand All @@ -73,7 +73,6 @@ def setup_nodes(self):

def run_test(self):
getcontext().prec = 6
self.nodes[0].generate(400)
self.sync_all()

for denom in denoms.values():
Expand All @@ -86,7 +85,7 @@ def run_test(self):
for denom in denoms.values():
self.nodes[0].mint(denom)
self.nodes[0].mint(denom)
self.nodes[0].generate(2)
self.nodes[0].generate(2)
self.sync_all()

pubcoins = [(pubcoin['denomination'], pubcoin['IsUsed'])
Expand Down
1 change: 0 additions & 1 deletion qa/rpc-tests/sigma_listsigmaspends_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def setup_nodes(self):

def run_test(self):
getcontext().prec = 6
self.nodes[0].generate(400)
self.sync_all()

assert not self.nodes[0].listsigmaspends(1), 'List sigma spends should be empty.'
Expand Down
1 change: 0 additions & 1 deletion qa/rpc-tests/sigma_listunspentmints_sigma_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def setup_nodes(self):

def run_test(self):
getcontext().prec = 6
self.nodes[0].generate(400)
self.sync_all()

assert not self.nodes[0].listunspentsigmamints(), 'List sigma unspent mints should be empty.'
Expand Down
2 changes: 1 addition & 1 deletion qa/rpc-tests/sigma_meetspend.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def run_test(self):
# Decimal formating: 6 digits for balance will be enought 000.000
getcontext().prec = 6

self.nodes[0].generate(400)
self.nodes[0].generate(200)
self.sync_all()

start_bal = self.nodes[0].getbalance()
Expand Down
4 changes: 3 additions & 1 deletion qa/rpc-tests/sigma_mint_validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ def setup_nodes(self):
def run_test(self):
# Decimal formating: 6 digits for balance will be enought 000.000
getcontext().prec = 6
self.nodes[0].generate(400)
self.nodes[0].generate(150)
self.sync_all()

for input_data, exp_err in zip(validation_inputs_no_funds, post_outputs_no_funds):
case_name, denom = input_data
exp_code, exp_msg = exp_err
Expand Down
2 changes: 0 additions & 2 deletions qa/rpc-tests/sigma_mintspend.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ def setup_nodes(self):
def run_test(self):
# Decimal formating: 6 digits for balance will be enought 000.000
getcontext().prec = 6
self.nodes[0].generate(551)
self.sync_all()

# old denomination
# TODO should be changed after RPC will be updated
Expand Down
3 changes: 1 addition & 2 deletions qa/rpc-tests/sigma_nonhd_wallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def assert_disable_nonhd(self, fn, *args):

def run_test(self):
node = self.nodes[0]
node.generate(500)
node.generate(300)

self.assert_disable_nonhd(node.listunspentsigmamints)
self.assert_disable_nonhd(node.mint, 1)
Expand All @@ -36,7 +36,6 @@ def run_test(self):
self.assert_disable_nonhd(node.listsigmapubcoins)
self.assert_disable_nonhd(node.setsigmamintstatus, "abc", True)
self.assert_disable_nonhd(node.listsigmaspends, 0)
self.assert_disable_nonhd(node.remintzerocointosigma, 1)

if __name__ == '__main__':
SigmaNonHDWalletTest().main()
87 changes: 0 additions & 87 deletions qa/rpc-tests/sigma_remint.py

This file was deleted.

Loading

0 comments on commit 6f2fa2b

Please sign in to comment.