Browse Source

Merge #10137: Remove unused import. Remove accidental trailing semicolons.

73b3721 Remove accidental trailing semicolons (practicalswift)
b8d9a86 Remove unused import (practicalswift)

Tree-SHA512: 36ac38952f8a10f36d2300519c583ef77703cff761be97470be97cfda2fec9d5b7ac604e454f174cc2601160e5cef3f227021ab5d3a6febc97fcb486d78754d3
pull/1/head
MarcoFalke 5 years ago
parent
commit
75171f099e
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
  1. 1
      test/functional/bip9-softforks.py
  2. 1
      test/functional/p2p-versionbits-warning.py
  3. 6
      test/functional/wallet-hd.py

1
test/functional/bip9-softforks.py

@ -16,7 +16,6 @@ test that enforcement has not triggered (which triggers ACTIVE) @@ -16,7 +16,6 @@ test that enforcement has not triggered (which triggers ACTIVE)
test that enforcement has triggered
"""
from test_framework.blockstore import BlockStore
from test_framework.test_framework import ComparisonTestFramework
from test_framework.util import *
from test_framework.mininode import CTransaction, NetworkThread

1
test/functional/p2p-versionbits-warning.py

@ -12,7 +12,6 @@ from test_framework.mininode import * @@ -12,7 +12,6 @@ from test_framework.mininode import *
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import *
import re
import time
from test_framework.blocktools import create_block, create_coinbase
VB_PERIOD = 144 # versionbits period length for regtest

6
test/functional/wallet-hd.py

@ -39,7 +39,7 @@ class WalletHDTest(BitcoinTestFramework): @@ -39,7 +39,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key
change_addr = self.nodes[1].getrawchangeaddress()
change_addrV= self.nodes[1].validateaddress(change_addr);
change_addrV= self.nodes[1].validateaddress(change_addr)
assert_equal(change_addrV["hdkeypath"], "m/0'/1'/0'") #first internal child key
# Import a non-HD private key in the HD wallet
@ -67,7 +67,7 @@ class WalletHDTest(BitcoinTestFramework): @@ -67,7 +67,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key (again)
change_addr = self.nodes[1].getrawchangeaddress()
change_addrV= self.nodes[1].validateaddress(change_addr);
change_addrV= self.nodes[1].validateaddress(change_addr)
assert_equal(change_addrV["hdkeypath"], "m/0'/1'/1'") #second internal child key
self.sync_all()
@ -97,7 +97,7 @@ class WalletHDTest(BitcoinTestFramework): @@ -97,7 +97,7 @@ class WalletHDTest(BitcoinTestFramework):
# send a tx and make sure its using the internal chain for the changeoutput
txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1)
outs = self.nodes[1].decoderawtransaction(self.nodes[1].gettransaction(txid)['hex'])['vout'];
outs = self.nodes[1].decoderawtransaction(self.nodes[1].gettransaction(txid)['hex'])['vout']
keypath = ""
for out in outs:
if out['value'] != 1:

Loading…
Cancel
Save