Browse Source

Merge #10047: [tests] Remove unused variables and imports

3897459 [tests] Remove unused variables (practicalswift)
72163d4 [tests] Remove unused and duplicate imports (practicalswift)

Tree-SHA512: 926af14b844bfca3bdd08b3cfdcb0edd3652efb4612d5571fee9abb917a6ce4e7d11d3601ff9c3d017e943ebe1e9ebdfccaf0af3db84d201b61941e9c1c9146a
0.15
MarcoFalke 8 years ago
parent
commit
dfef6b6af0
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
  1. 2
      contrib/testgen/gen_base58_test_vectors.py
  2. 4
      test/functional/bip68-sequence.py
  3. 1
      test/functional/fundrawtransaction.py
  4. 1
      test/functional/import-rescan.py
  5. 2
      test/functional/multi_rpc.py
  6. 1
      test/functional/rawtransactions.py
  7. 5
      test/functional/segwit.py
  8. 3
      test/functional/smartfees.py
  9. 1
      test/functional/test_framework/socks5.py
  10. 1
      test/functional/test_framework/test_framework.py
  11. 1
      test/functional/zmq_test.py

2
contrib/testgen/gen_base58_test_vectors.py

@ -13,7 +13,7 @@ Usage: @@ -13,7 +13,7 @@ Usage:
# Released under MIT License
import os
from itertools import islice
from base58 import b58encode, b58decode, b58encode_chk, b58decode_chk, b58chars
from base58 import b58encode_chk, b58decode_chk, b58chars
import random
from binascii import b2a_hex

4
test/functional/bip68-sequence.py

@ -378,8 +378,8 @@ class BIP68Test(BitcoinTestFramework): @@ -378,8 +378,8 @@ class BIP68Test(BitcoinTestFramework):
# activation should happen at block height 432 (3 periods)
min_activation_height = 432
height = self.nodes[0].getblockcount()
assert(height < 432)
self.nodes[0].generate(432-height)
assert(height < min_activation_height)
self.nodes[0].generate(min_activation_height-height)
assert(get_bip9_status(self.nodes[0], 'csv')['status'] == 'active')
sync_blocks(self.nodes)

1
test/functional/fundrawtransaction.py

@ -691,7 +691,6 @@ class RawTransactionsTest(BitcoinTestFramework): @@ -691,7 +691,6 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = []
outputs = {self.nodes[2].getnewaddress(): value for value in (1.0, 1.1, 1.2, 1.3)}
keys = list(outputs.keys())
rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
result = [self.nodes[3].fundrawtransaction(rawtx),

1
test/functional/import-rescan.py

@ -22,7 +22,6 @@ happened previously. @@ -22,7 +22,6 @@ happened previously.
from test_framework.authproxy import JSONRPCException
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import (start_nodes, connect_nodes, sync_blocks, assert_equal, set_node_times)
from decimal import Decimal
import collections
import enum

2
test/functional/multi_rpc.py

@ -41,11 +41,9 @@ class HTTPBasicsTest (BitcoinTestFramework): @@ -41,11 +41,9 @@ class HTTPBasicsTest (BitcoinTestFramework):
authpair = url.username + ':' + url.password
#New authpair generated via share/rpcuser tool
rpcauth = "rpcauth=rt:93648e835a54c573682c2eb19f882535$7681e9c5b74bdd85e78166031d2058e1069b3ed7ed967c93fc63abba06f31144"
password = "cA773lm788buwYe4g4WT+05pKyNruVKjQ25x3n0DQcM="
#Second authpair with different username
rpcauth2 = "rpcauth=rt2:f8607b1a88861fac29dfccf9b52ff9f$ff36a0c23c8c62b4846112e50fa888416e94c17bfd4c42f88fd8f55ec6a3137e"
password2 = "8/F3uMDw4KSEbw96U3CA1C4X05dkHDN2BPFjTgZW4KI="
authpairnew = "rt:"+password

1
test/functional/rawtransactions.py

@ -104,7 +104,6 @@ class RawTransactionsTest(BitcoinTestFramework): @@ -104,7 +104,6 @@ class RawTransactionsTest(BitcoinTestFramework):
txId = self.nodes[0].sendtoaddress(mSigObj, 2.2)
decTx = self.nodes[0].gettransaction(txId)
rawTx = self.nodes[0].decoderawtransaction(decTx['hex'])
sPK = rawTx['vout'][0]['scriptPubKey']['hex']
self.sync_all()
self.nodes[0].generate(1)
self.sync_all()

5
test/functional/segwit.py

@ -6,11 +6,10 @@ @@ -6,11 +6,10 @@
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import *
from test_framework.mininode import sha256, ripemd160, CTransaction, CTxIn, COutPoint, CTxOut, COIN
from test_framework.mininode import sha256, CTransaction, CTxIn, COutPoint, CTxOut, COIN, ToHex, FromHex
from test_framework.address import script_to_p2sh, key_to_p2pkh
from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG, hash160, OP_TRUE
from test_framework.script import CScript, OP_HASH160, OP_CHECKSIG, OP_0, hash160, OP_EQUAL, OP_DUP, OP_EQUALVERIFY, OP_1, OP_2, OP_CHECKMULTISIG, OP_TRUE
from io import BytesIO
from test_framework.mininode import ToHex, FromHex, COIN
NODE_0 = 0
NODE_1 = 1

3
test/functional/smartfees.py

@ -4,11 +4,10 @@ @@ -4,11 +4,10 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test fee estimation code."""
from collections import OrderedDict
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import *
from test_framework.script import CScript, OP_1, OP_DROP, OP_2, OP_HASH160, OP_EQUAL, hash160, OP_TRUE
from test_framework.mininode import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, FromHex, COIN
from test_framework.mininode import CTransaction, CTxIn, CTxOut, COutPoint, ToHex, COIN
# Construct 2 trivial P2SH's and the ScriptSigs that spend them
# So we can create many many transactions without needing to spend

1
test/functional/test_framework/socks5.py

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
"""Dummy Socks5 server for testing."""
import socket, threading, queue
import traceback, sys
import logging
logger = logging.getLogger("TestFramework.socks5")

1
test/functional/test_framework/test_framework.py

@ -11,7 +11,6 @@ import sys @@ -11,7 +11,6 @@ import sys
import shutil
import tempfile
import time
import traceback
from .util import (
initialize_chain,

1
test/functional/zmq_test.py

@ -41,7 +41,6 @@ class ZMQTest (BitcoinTestFramework): @@ -41,7 +41,6 @@ class ZMQTest (BitcoinTestFramework):
topic = msg[0]
assert_equal(topic, b"hashtx")
body = msg[1]
nseq = msg[2]
msgSequence = struct.unpack('<I', msg[-1])[-1]
assert_equal(msgSequence, 0) #must be sequence 0 on hashtx

Loading…
Cancel
Save