Fix failing tests

Signed-off-by: Mihai Ciumeica <mihai@thirdhash.com>
dtr-org · Apr 10, 2019 · 3335689 · 3335689
1 parent 491de61
commit 3335689
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/functional/finalization_slash_itself.py b/test/functional/finalization_slash_itself.py
@@ -70,7 +70,6 @@ def test_double_votes(self):
         txid1 = finalizer1.deposit(addr, 1500)
         wait_until(lambda: txid1 in fork1.getrawmempool())
 
-        finalizer2.setaccount(addr, '')
         txid2 = finalizer2.deposit(addr, 1500)
         assert_equal(txid1, txid2)
         connect_nodes(fork1, finalizer2.index)
@@ -127,7 +126,7 @@ def test_double_votes(self):
                                          'validators': 1})
 
         # Send the conflicting vote from the other chain to finalizer2, it should record it and slash it later
-        assert_raises_rpc_error(-26, " bad-vote-invalid-state", finalizer2.sendrawtransaction, raw_vote_1)
+        assert_raises_rpc_error(-26, "bad-vote-invalid-state", finalizer2.sendrawtransaction, raw_vote_1)
 
         fork2.generatetoaddress(1, fork2.getnewaddress('', 'bech32'))
         self.wait_for_vote_and_disconnect(finalizer=finalizer2, node=fork2)
@@ -161,7 +160,7 @@ def test_double_votes(self):
 
         self.wait_for_vote_and_disconnect(finalizer=finalizer2, node=fork2)
 
-        assert_raises_rpc_error(-26, " bad-vote-invalid-state", finalizer2.sendrawtransaction, raw_vote_2)
+        assert_raises_rpc_error(-26, "bad-vote-invalid-state", finalizer2.sendrawtransaction, raw_vote_2)
 
         # The vote hasn't been replaces by a slash
         vote = finalizer2.decoderawtransaction(finalizer2.getrawtransaction(finalizer2.getrawmempool()[0]))

diff --git a/test/functional/test_framework/blocktools.py b/test/functional/test_framework/blocktools.py
@@ -22,6 +22,7 @@
     TxType,
     UTXO,
     msg_block,
+    msg_witness_block,
     ser_uint256,
     ser_vector,
     sha256,