DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Cosmetics in RPC tests.

Browse Source 
Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Daira Hopwood
2016-10-10 20:27:16 +01:00
parent 218ded68f3
commit 3040239e2a
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qa/rpc-tests/txn_doublespend.py
View File

@@ -75,7 +75,7 @@ class TxnMallTest(BitcoinTestFramework):
else: else:
assert_equal(tx1["confirmations"], 0) assert_equal(tx1["confirmations"], 0)
assert_equal(tx2["confirmations"], 0) assert_equal(tx2["confirmations"], 0)
# Now give doublespend to miner: # Now give doublespend to miner:
mutated_txid = self.nodes[2].sendrawtransaction(doublespend["hex"]) mutated_txid = self.nodes[2].sendrawtransaction(doublespend["hex"])
# ... mine a block... # ... mine a block...
@@ -89,7 +89,7 @@ class TxnMallTest(BitcoinTestFramework):
# Re-fetch transaction info: # Re-fetch transaction info:
tx1 = self.nodes[0].gettransaction(txid1) tx1 = self.nodes[0].gettransaction(txid1)
tx2 = self.nodes[0].gettransaction(txid2) tx2 = self.nodes[0].gettransaction(txid2)
# Both transactions should be conflicted # Both transactions should be conflicted
assert_equal(tx1["confirmations"], -1) assert_equal(tx1["confirmations"], -1)
assert_equal(tx2["confirmations"], -1) assert_equal(tx2["confirmations"], -1)

18
qa/rpc-tests/wallet.py
View File

@@ -150,7 +150,7 @@ class WalletTest (BitcoinTestFramework):
sync_mempools(self.nodes) sync_mempools(self.nodes)
assert(txid1 in self.nodes[3].getrawmempool()) assert(txid1 in self.nodes[3].getrawmempool())
#check if we can list zero value tx as available coins #check if we can list zero value tx as available coins
#1. create rawtx #1. create rawtx
#2. hex-changed one output to 0.0 #2. hex-changed one output to 0.0
@@ -159,18 +159,18 @@ class WalletTest (BitcoinTestFramework):
usp = self.nodes[1].listunspent() usp = self.nodes[1].listunspent()
inputs = [{"txid":usp[0]['txid'], "vout":usp[0]['vout']}] inputs = [{"txid":usp[0]['txid'], "vout":usp[0]['vout']}]
outputs = {self.nodes[1].getnewaddress(): 9.998, self.nodes[0].getnewaddress(): 11.11} outputs = {self.nodes[1].getnewaddress(): 9.998, self.nodes[0].getnewaddress(): 11.11}
rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32) rawTx = self.nodes[1].createrawtransaction(inputs, outputs).replace("c0833842", "00000000") #replace 11.11 with 0.0 (int32)
decRawTx = self.nodes[1].decoderawtransaction(rawTx) decRawTx = self.nodes[1].decoderawtransaction(rawTx)
signedRawTx = self.nodes[1].signrawtransaction(rawTx) signedRawTx = self.nodes[1].signrawtransaction(rawTx)
decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex']) decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex'])
zeroValueTxid= decRawTx['txid'] zeroValueTxid= decRawTx['txid']
sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex']) sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex'])
self.sync_all() self.sync_all()
self.nodes[1].generate(1) #mine a block self.nodes[1].generate(1) #mine a block
self.sync_all() self.sync_all()
unspentTxs = self.nodes[0].listunspent() #zero value tx must be in listunspents output unspentTxs = self.nodes[0].listunspent() #zero value tx must be in listunspents output
found = False found = False
for uTx in unspentTxs: for uTx in unspentTxs:
@@ -178,7 +178,7 @@ class WalletTest (BitcoinTestFramework):
found = True found = True
assert_equal(uTx['amount'], Decimal('0.00000000')); assert_equal(uTx['amount'], Decimal('0.00000000'));
assert(found) assert(found)
#do some -walletbroadcast tests #do some -walletbroadcast tests
stop_nodes(self.nodes) stop_nodes(self.nodes)
wait_bitcoinds() wait_bitcoinds()
@@ -202,10 +202,10 @@ class WalletTest (BitcoinTestFramework):
txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted) txObjNotBroadcasted = self.nodes[0].gettransaction(txIdNotBroadcasted)
assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')); #should not be assert_equal(self.nodes[2].getbalance(), Decimal('11.99800000')); #should not be
assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')); #should not be assert_equal(self.nodes[2].getbalance("*"), Decimal('11.99800000')); #should not be
#create another tx #create another tx
txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2); txIdNotBroadcasted = self.nodes[0].sendtoaddress(self.nodes[2].getnewaddress(), 2);
#restart the nodes with -walletbroadcast=1 #restart the nodes with -walletbroadcast=1
stop_nodes(self.nodes) stop_nodes(self.nodes)
wait_bitcoinds() wait_bitcoinds()
@@ -214,10 +214,10 @@ class WalletTest (BitcoinTestFramework):
connect_nodes_bi(self.nodes,1,2) connect_nodes_bi(self.nodes,1,2)
connect_nodes_bi(self.nodes,0,2) connect_nodes_bi(self.nodes,0,2)
sync_blocks(self.nodes) sync_blocks(self.nodes)
self.nodes[0].generate(1) self.nodes[0].generate(1)
sync_blocks(self.nodes) sync_blocks(self.nodes)
#tx should be added to balance because after restarting the nodes tx should be broadcastet #tx should be added to balance because after restarting the nodes tx should be broadcastet
assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')); #should not be assert_equal(self.nodes[2].getbalance(), Decimal('13.99800000')); #should not be
assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')); #should not be assert_equal(self.nodes[2].getbalance("*"), Decimal('13.99800000')); #should not be