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
This commit is contained in:
MarcoFalke 2017-03-23 11:36:45 +01:00 committed by Pasta
parent 96a5f5730b
commit 9f07f489de
No known key found for this signature in database
GPG Key ID: 0B8EB7A31A44D9C6
10 changed files with 4 additions and 13 deletions

View File

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

View File

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

View File

@ -698,7 +698,6 @@ class RawTransactionsTest(BitcoinTestFramework):
inputs = [] inputs = []
outputs = {self.nodes[2].getnewaddress(): value for value in (1.0, 1.1, 1.2, 1.3)} 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) rawtx = self.nodes[3].createrawtransaction(inputs, outputs)
result = [self.nodes[3].fundrawtransaction(rawtx), result = [self.nodes[3].fundrawtransaction(rawtx),

View File

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

View File

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

View File

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

View File

@ -4,11 +4,10 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test fee estimation code.""" """Test fee estimation code."""
from collections import OrderedDict
from test_framework.test_framework import BitcoinTestFramework from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import * 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.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 # Construct 2 trivial P2SH's and the ScriptSigs that spend them
# So we can create many many transactions without needing to spend # So we can create many many transactions without needing to spend

View File

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

View File

@ -11,7 +11,6 @@ import sys
import shutil import shutil
import tempfile import tempfile
import time import time
import traceback
from concurrent.futures import ThreadPoolExecutor from concurrent.futures import ThreadPoolExecutor
from time import time, sleep from time import time, sleep

View File

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