sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 04:22:55 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

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

Tree-SHA512: 36ac38952f8a10f36d2300519c583ef77703cff761be97470be97cfda2fec9d5b7ac604e454f174cc2601160e5cef3f227021ab5d3a6febc97fcb486d78754d3
This commit is contained in:
MarcoFalke 2017-05-02 20:50:57 +02:00 committed by Pasta
parent 52de8b11d5
commit 9419534249
No known key found for this signature in database
GPG Key ID: D362C9F7142766AE
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/functional/bip9-softforks.py
View File

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

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

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

6
test/functional/wallet-hd.py
View File

@ -30,7 +30,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key # create an internal key
change_addr = self.nodes[1].getrawchangeaddress() 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/44'/1'/0'/1/0") #first internal child key assert_equal(change_addrV["hdkeypath"], "m/44'/1'/0'/1/0") #first internal child key
# Import a non-HD private key in the HD wallet # Import a non-HD private key in the HD wallet
@ -58,7 +58,7 @@ class WalletHDTest(BitcoinTestFramework):
# create an internal key (again) # create an internal key (again)
change_addr = self.nodes[1].getrawchangeaddress() 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/44'/1'/0'/1/1") #second internal child key assert_equal(change_addrV["hdkeypath"], "m/44'/1'/0'/1/1") #second internal child key
self.sync_all() self.sync_all()
@ -88,7 +88,7 @@ class WalletHDTest(BitcoinTestFramework):
# send a tx and make sure its using the internal chain for the changeoutput # send a tx and make sure its using the internal chain for the changeoutput
txid = self.nodes[1].sendtoaddress(self.nodes[0].getnewaddress(), 1) 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 = "" keypath = ""
for out in outs: for out in outs:
if out['value'] != 1: if out['value'] != 1: