diff --git a/test/functional/bip68-sequence.py b/test/functional/bip68-sequence.py --- a/test/functional/bip68-sequence.py +++ b/test/functional/bip68-sequence.py @@ -461,7 +461,7 @@ tx.nVersion = 2 tx_signed = self.nodes[1].signrawtransaction(ToHex(tx))["hex"] try: - tx_id = self.nodes[1].sendrawtransaction(tx_signed) + self.nodes[1].sendrawtransaction(tx_signed) assert(before_activation == False) except: assert(before_activation) diff --git a/test/functional/fundrawtransaction.py b/test/functional/fundrawtransaction.py --- a/test/functional/fundrawtransaction.py +++ b/test/functional/fundrawtransaction.py @@ -316,7 +316,6 @@ # # test a fundrawtransaction with invalid vin # # - listunspent = self.nodes[2].listunspent() inputs = [ {'txid': "1c7f966dab21119bac53213a2bc7532bff1fa844c124fd750a7d0b1332440bd1", 'vout': 0}] # invalid vin! diff --git a/test/functional/import-rescan.py b/test/functional/import-rescan.py --- a/test/functional/import-rescan.py +++ b/test/functional/import-rescan.py @@ -174,7 +174,6 @@ variant.check() # Create new transactions sending to each address. - fee = self.nodes[0].getnetworkinfo()["relayfee"] for i, variant in enumerate(IMPORT_VARIANTS): variant.sent_amount = 10 - (2 * i + 1) / 8.0 variant.sent_txid = self.nodes[0].sendtoaddress( diff --git a/test/functional/importmulti.py b/test/functional/importmulti.py --- a/test/functional/importmulti.py +++ b/test/functional/importmulti.py @@ -22,18 +22,8 @@ timestamp = self.nodes[1].getblock( self.nodes[1].getbestblockhash())['mediantime'] - # keyword definition - PRIV_KEY = 'privkey' - PUB_KEY = 'pubkey' - ADDRESS_KEY = 'address' - SCRIPT_KEY = 'script' - node0_address1 = self.nodes[0].validateaddress( self.nodes[0].getnewaddress()) - node0_address2 = self.nodes[0].validateaddress( - self.nodes[0].getnewaddress()) - node0_address3 = self.nodes[0].validateaddress( - self.nodes[0].getnewaddress()) # Check only one address assert_equal(node0_address1['ismine'], True) @@ -258,7 +248,6 @@ self.nodes[1].generate(1) timestamp = self.nodes[1].getblock( self.nodes[1].getbestblockhash())['mediantime'] - transaction = self.nodes[1].gettransaction(transactionid) self.log.info("Should import a p2sh") result = self.nodes[1].importmulti([{ @@ -293,7 +282,6 @@ self.nodes[1].generate(1) timestamp = self.nodes[1].getblock( self.nodes[1].getbestblockhash())['mediantime'] - transaction = self.nodes[1].gettransaction(transactionid) self.log.info("Should import a p2sh with respective redeem script") result = self.nodes[1].importmulti([{ @@ -328,7 +316,6 @@ self.nodes[1].generate(1) timestamp = self.nodes[1].getblock( self.nodes[1].getbestblockhash())['mediantime'] - transaction = self.nodes[1].gettransaction(transactionid) self.log.info( "Should import a p2sh with respective redeem script and private keys") @@ -365,7 +352,6 @@ self.nodes[1].generate(1) timestamp = self.nodes[1].getblock( self.nodes[1].getbestblockhash())['mediantime'] - transaction = self.nodes[1].gettransaction(transactionid) self.log.info( "Should import a p2sh with respective redeem script and private keys") diff --git a/test/functional/importprunedfunds.py b/test/functional/importprunedfunds.py --- a/test/functional/importprunedfunds.py +++ b/test/functional/importprunedfunds.py @@ -22,8 +22,6 @@ address1 = self.nodes[0].getnewaddress() # pubkey address2 = self.nodes[0].getnewaddress() - # Using pubkey - address2_pubkey = self.nodes[0].validateaddress(address2)['pubkey'] # privkey address3 = self.nodes[0].getnewaddress() # Using privkey @@ -78,13 +76,13 @@ # Import with affiliated address with no rescan self.nodes[1].importaddress(address2, "add2", False) - result2 = self.nodes[1].importprunedfunds(rawtxn2, proof2) + self.nodes[1].importprunedfunds(rawtxn2, proof2) balance2 = self.nodes[1].getbalance("add2", 0, True) assert_equal(balance2, Decimal('0.05')) # Import with private key with no rescan self.nodes[1].importprivkey(address3_privkey, "add3", False) - result3 = self.nodes[1].importprunedfunds(rawtxn3, proof3) + self.nodes[1].importprunedfunds(rawtxn3, proof3) balance3 = self.nodes[1].getbalance("add3", 0, False) assert_equal(balance3, Decimal('0.025')) balance3 = self.nodes[1].getbalance("*", 0, True) diff --git a/test/functional/p2p-fullblocktest.py b/test/functional/p2p-fullblocktest.py --- a/test/functional/p2p-fullblocktest.py +++ b/test/functional/p2p-fullblocktest.py @@ -397,7 +397,7 @@ yield rejected(RejectResult(16, b'bad-cb-length')) # Extend the b26 chain to make sure bitcoind isn't accepting b26 - b27 = block(27, spend=out[7]) + block(27, spend=out[7]) yield rejected(False) # Now try a too-large-coinbase script @@ -409,7 +409,7 @@ yield rejected(RejectResult(16, b'bad-cb-length')) # Extend the b28 chain to make sure bitcoind isn't accepting b28 - b29 = block(29, spend=out[7]) + block(29, spend=out[7]) yield rejected(False) # b30 has a max-sized coinbase scriptSig. @@ -602,7 +602,7 @@ # same as b40, but one less sigop tip(39) - b41 = block(41, spend=None) + block(41, spend=None) update_block(41, [b40tx for b40tx in b40.vtx[1:] if b40tx != tx]) b41_sigops_to_fill = b40_sigops_to_fill - 1 tx = CTransaction() @@ -950,7 +950,7 @@ # -> b42 (12) -> b43 (13) -> b53 (14) -> b55 (15) -> b57 (16) -> b60 (17) -> b64 (18) -> b65 (19) # tip(64) - b65 = block(65) + block(65) tx1 = create_and_sign_tx( out[19].tx, out[19].n, out[19].tx.vout[0].nValue) tx2 = create_and_sign_tx(tx1, 0, 0) @@ -965,7 +965,7 @@ # # tip(65) - b67 = block(67) + block(67) tx1 = create_and_sign_tx( out[20].tx, out[20].n, out[20].tx.vout[0].nValue) tx2 = create_and_sign_tx(tx1, 0, 1) @@ -986,7 +986,7 @@ # this succeeds # tip(65) - b68 = block(68, additional_coinbase_value=10) + block(68, additional_coinbase_value=10) tx = create_and_sign_tx( out[20].tx, out[20].n, out[20].tx.vout[0].nValue - 9) update_block(68, [tx]) @@ -1199,7 +1199,7 @@ # # -> b81 (26) -> b82 (27) -> b83 (28) # - b83 = block(83) + block(83) op_codes = [OP_IF, OP_INVALIDOPCODE, OP_ELSE, OP_TRUE, OP_ENDIF] script = CScript(op_codes) tx1 = create_and_sign_tx( @@ -1219,7 +1219,7 @@ # \-> b85 (29) -> b86 (30) \-> b89a (32) # # - b84 = block(84) + block(84) tx1 = create_tx(out[29].tx, out[29].n, 0, CScript([OP_RETURN])) vout_offset = len(tx1.vout) tx1.vout.append(CTxOut(0, CScript([OP_TRUE]))) diff --git a/test/functional/rawtransactions.py b/test/functional/rawtransactions.py --- a/test/functional/rawtransactions.py +++ b/test/functional/rawtransactions.py @@ -68,7 +68,6 @@ mSigObj = self.nodes[2].addmultisigaddress( 2, [addr1Obj['pubkey'], addr2Obj['pubkey']]) - mSigObjValid = self.nodes[2].validateaddress(mSigObj) # use balance deltas instead of absolute values bal = self.nodes[2].getbalance() @@ -94,7 +93,6 @@ mSigObj = self.nodes[2].addmultisigaddress( 2, [addr1Obj['pubkey'], addr2Obj['pubkey'], addr3Obj['pubkey']]) - mSigObjValid = self.nodes[2].validateaddress(mSigObj) txId = self.nodes[0].sendtoaddress(mSigObj, 2.2) decTx = self.nodes[0].gettransaction(txId) diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py --- a/test/functional/test_framework/address.py +++ b/test/functional/test_framework/address.py @@ -50,18 +50,6 @@ return scripthash_to_p2sh(hash160(script), main) -def key_to_p2sh_p2wpkh(key, main=False): - key = check_key(key) - p2shscript = CScript([OP_0, hash160(key)]) - return script_to_p2sh(p2shscript, main) - - -def script_to_p2sh_p2wsh(script, main=False): - script = check_script(script) - p2shscript = CScript([OP_0, sha256(script)]) - return script_to_p2sh(p2shscript, main) - - def check_key(key): if (type(key) is str): key = hex_str_to_bytes(key) # Assuming this is hex string diff --git a/test/functional/test_framework/bignum.py b/test/functional/test_framework/bignum.py --- a/test/functional/test_framework/bignum.py +++ b/test/functional/test_framework/bignum.py @@ -28,13 +28,6 @@ return s -def bin2bn(s): - l = 0 - for ch in s: - l = (l << 8) | ch - return l - - def bn2mpi(v): have_ext = False if v.bit_length() > 0: @@ -58,30 +51,6 @@ return s + ext + v_bin -def mpi2bn(s): - if len(s) < 4: - return None - s_size = bytes(s[:4]) - v_len = struct.unpack(b">I", s_size)[0] - if len(s) != (v_len + 4): - return None - if v_len == 0: - return 0 - - v_str = bytearray(s[4:]) - neg = False - i = v_str[0] - if i & 0x80: - neg = True - i &= ~0x80 - v_str[0] = i - - v = bin2bn(v_str) - - if neg: - return -v - return v - # bitcoin-specific little endian format, with implicit size @@ -93,13 +62,3 @@ def bn2vch(v): return bytes(mpi2vch(bn2mpi(v))) - - -def vch2mpi(s): - r = struct.pack(b">I", len(s)) # size - r += s[::-1] # reverse string, converting LE->BE - return r - - -def vch2bn(s): - return mpi2bn(vch2mpi(s)) diff --git a/test/functional/test_framework/blockstore.py b/test/functional/test_framework/blockstore.py --- a/test/functional/test_framework/blockstore.py +++ b/test/functional/test_framework/blockstore.py @@ -145,16 +145,6 @@ return None return value - def get_transaction(self, txhash): - ret = None - serialized_tx = self.get(txhash) - if serialized_tx is not None: - f = BytesIO(serialized_tx) - ret = CTransaction() - ret.deserialize(f) - ret.calc_sha256() - return ret - def add_transaction(self, tx): tx.calc_sha256() try: diff --git a/test/functional/test_framework/mininode.py b/test/functional/test_framework/mininode.py --- a/test/functional/test_framework/mininode.py +++ b/test/functional/test_framework/mininode.py @@ -49,8 +49,8 @@ COIN = 100000000 # 1 btc in satoshis NODE_NETWORK = (1 << 0) -NODE_GETUTXO = (1 << 1) -NODE_BLOOM = (1 << 2) +# NODE_GETUTXO = (1 << 1) +# NODE_BLOOM = (1 << 2) NODE_WITNESS = (1 << 3) NODE_XTHIN = (1 << 4) NODE_BITCOIN_CASH = (1 << 5) @@ -857,6 +857,7 @@ def __repr__(self): return "msg_addr(addrs=%s)" % (repr(self.addrs)) + class msg_inv(): command = b"inv" @@ -1266,9 +1267,6 @@ # before acquiring the global lock and delivering the next message. self.deliver_sleep_time = None - # Remember the services our peer has advertised - self.peer_services = None - # Message receiving methods def deliver(self, conn, message): @@ -1294,10 +1292,6 @@ sys.exc_info()[0])) raise - def set_deliver_sleep_time(self, value): - with mininode_lock: - self.deliver_sleep_time = value - def get_deliver_sleep_time(self): with mininode_lock: return self.deliver_sleep_time diff --git a/test/functional/test_framework/netutil.py b/test/functional/test_framework/netutil.py --- a/test/functional/test_framework/netutil.py +++ b/test/functional/test_framework/netutil.py @@ -15,17 +15,17 @@ import os from binascii import unhexlify, hexlify -STATE_ESTABLISHED = '01' -STATE_SYN_SENT = '02' -STATE_SYN_RECV = '03' -STATE_FIN_WAIT1 = '04' -STATE_FIN_WAIT2 = '05' -STATE_TIME_WAIT = '06' -STATE_CLOSE = '07' -STATE_CLOSE_WAIT = '08' -STATE_LAST_ACK = '09' +# STATE_ESTABLISHED = '01' +# STATE_SYN_SENT = '02' +# STATE_SYN_RECV = '03' +# STATE_FIN_WAIT1 = '04' +# STATE_FIN_WAIT2 = '05' +# STATE_TIME_WAIT = '06' +# STATE_CLOSE = '07' +# STATE_CLOSE_WAIT = '08' +# STATE_LAST_ACK = '09' STATE_LISTEN = '0A' -STATE_CLOSING = '0B' +# STATE_CLOSING = '0B' def get_socket_inodes(pid): diff --git a/test/functional/test_framework/script.py b/test/functional/test_framework/script.py --- a/test/functional/test_framework/script.py +++ b/test/functional/test_framework/script.py @@ -25,9 +25,7 @@ from .bignum import bn2vch -MAX_SCRIPT_SIZE = 10000 MAX_SCRIPT_ELEMENT_SIZE = 520 -MAX_SCRIPT_OPCODES = 201 OPCODE_NAMES = {} @@ -257,133 +255,6 @@ OP_INVALIDOPCODE = CScriptOp(0xff) -VALID_OPCODES = { - OP_1NEGATE, - OP_RESERVED, - OP_1, - OP_2, - OP_3, - OP_4, - OP_5, - OP_6, - OP_7, - OP_8, - OP_9, - OP_10, - OP_11, - OP_12, - OP_13, - OP_14, - OP_15, - OP_16, - - OP_NOP, - OP_VER, - OP_IF, - OP_NOTIF, - OP_VERIF, - OP_VERNOTIF, - OP_ELSE, - OP_ENDIF, - OP_VERIFY, - OP_RETURN, - - OP_TOALTSTACK, - OP_FROMALTSTACK, - OP_2DROP, - OP_2DUP, - OP_3DUP, - OP_2OVER, - OP_2ROT, - OP_2SWAP, - OP_IFDUP, - OP_DEPTH, - OP_DROP, - OP_DUP, - OP_NIP, - OP_OVER, - OP_PICK, - OP_ROLL, - OP_ROT, - OP_SWAP, - OP_TUCK, - - OP_CAT, - OP_SPLIT, - OP_NUM2BIN, - OP_BIN2NUM, - OP_SIZE, - - OP_INVERT, - OP_AND, - OP_OR, - OP_XOR, - OP_EQUAL, - OP_EQUALVERIFY, - OP_RESERVED1, - OP_RESERVED2, - - OP_1ADD, - OP_1SUB, - OP_2MUL, - OP_2DIV, - OP_NEGATE, - OP_ABS, - OP_NOT, - OP_0NOTEQUAL, - - OP_ADD, - OP_SUB, - OP_MUL, - OP_DIV, - OP_MOD, - OP_LSHIFT, - OP_RSHIFT, - - OP_BOOLAND, - OP_BOOLOR, - OP_NUMEQUAL, - OP_NUMEQUALVERIFY, - OP_NUMNOTEQUAL, - OP_LESSTHAN, - OP_GREATERTHAN, - OP_LESSTHANOREQUAL, - OP_GREATERTHANOREQUAL, - OP_MIN, - OP_MAX, - - OP_WITHIN, - - OP_RIPEMD160, - OP_SHA1, - OP_SHA256, - OP_HASH160, - OP_HASH256, - OP_CODESEPARATOR, - OP_CHECKSIG, - OP_CHECKSIGVERIFY, - OP_CHECKMULTISIG, - OP_CHECKMULTISIGVERIFY, - OP_CHECKDATASIG, - OP_CHECKDATASIGVERIFY, - - OP_NOP1, - OP_CHECKLOCKTIMEVERIFY, - OP_CHECKSEQUENCEVERIFY, - OP_NOP4, - OP_NOP5, - OP_NOP6, - OP_NOP7, - OP_NOP8, - OP_NOP9, - OP_NOP10, - - OP_SMALLINTEGER, - OP_PUBKEYS, - OP_PUBKEYHASH, - OP_PUBKEY, -} - OPCODE_NAMES.update({ OP_0: 'OP_0', OP_PUSHDATA1: 'OP_PUSHDATA1', @@ -505,126 +376,6 @@ OP_INVALIDOPCODE: 'OP_INVALIDOPCODE', }) -OPCODES_BY_NAME = { - 'OP_0': OP_0, - 'OP_PUSHDATA1': OP_PUSHDATA1, - 'OP_PUSHDATA2': OP_PUSHDATA2, - 'OP_PUSHDATA4': OP_PUSHDATA4, - 'OP_1NEGATE': OP_1NEGATE, - 'OP_RESERVED': OP_RESERVED, - 'OP_1': OP_1, - 'OP_2': OP_2, - 'OP_3': OP_3, - 'OP_4': OP_4, - 'OP_5': OP_5, - 'OP_6': OP_6, - 'OP_7': OP_7, - 'OP_8': OP_8, - 'OP_9': OP_9, - 'OP_10': OP_10, - 'OP_11': OP_11, - 'OP_12': OP_12, - 'OP_13': OP_13, - 'OP_14': OP_14, - 'OP_15': OP_15, - 'OP_16': OP_16, - 'OP_NOP': OP_NOP, - 'OP_VER': OP_VER, - 'OP_IF': OP_IF, - 'OP_NOTIF': OP_NOTIF, - 'OP_VERIF': OP_VERIF, - 'OP_VERNOTIF': OP_VERNOTIF, - 'OP_ELSE': OP_ELSE, - 'OP_ENDIF': OP_ENDIF, - 'OP_VERIFY': OP_VERIFY, - 'OP_RETURN': OP_RETURN, - 'OP_TOALTSTACK': OP_TOALTSTACK, - 'OP_FROMALTSTACK': OP_FROMALTSTACK, - 'OP_2DROP': OP_2DROP, - 'OP_2DUP': OP_2DUP, - 'OP_3DUP': OP_3DUP, - 'OP_2OVER': OP_2OVER, - 'OP_2ROT': OP_2ROT, - 'OP_2SWAP': OP_2SWAP, - 'OP_IFDUP': OP_IFDUP, - 'OP_DEPTH': OP_DEPTH, - 'OP_DROP': OP_DROP, - 'OP_DUP': OP_DUP, - 'OP_NIP': OP_NIP, - 'OP_OVER': OP_OVER, - 'OP_PICK': OP_PICK, - 'OP_ROLL': OP_ROLL, - 'OP_ROT': OP_ROT, - 'OP_SWAP': OP_SWAP, - 'OP_TUCK': OP_TUCK, - 'OP_CAT': OP_CAT, - 'OP_SPLIT': OP_SPLIT, - 'OP_NUM2BIN': OP_NUM2BIN, - 'OP_BIN2NUM': OP_BIN2NUM, - 'OP_SIZE': OP_SIZE, - 'OP_INVERT': OP_INVERT, - 'OP_AND': OP_AND, - 'OP_OR': OP_OR, - 'OP_XOR': OP_XOR, - 'OP_EQUAL': OP_EQUAL, - 'OP_EQUALVERIFY': OP_EQUALVERIFY, - 'OP_RESERVED1': OP_RESERVED1, - 'OP_RESERVED2': OP_RESERVED2, - 'OP_1ADD': OP_1ADD, - 'OP_1SUB': OP_1SUB, - 'OP_2MUL': OP_2MUL, - 'OP_2DIV': OP_2DIV, - 'OP_NEGATE': OP_NEGATE, - 'OP_ABS': OP_ABS, - 'OP_NOT': OP_NOT, - 'OP_0NOTEQUAL': OP_0NOTEQUAL, - 'OP_ADD': OP_ADD, - 'OP_SUB': OP_SUB, - 'OP_MUL': OP_MUL, - 'OP_DIV': OP_DIV, - 'OP_MOD': OP_MOD, - 'OP_LSHIFT': OP_LSHIFT, - 'OP_RSHIFT': OP_RSHIFT, - 'OP_BOOLAND': OP_BOOLAND, - 'OP_BOOLOR': OP_BOOLOR, - 'OP_NUMEQUAL': OP_NUMEQUAL, - 'OP_NUMEQUALVERIFY': OP_NUMEQUALVERIFY, - 'OP_NUMNOTEQUAL': OP_NUMNOTEQUAL, - 'OP_LESSTHAN': OP_LESSTHAN, - 'OP_GREATERTHAN': OP_GREATERTHAN, - 'OP_LESSTHANOREQUAL': OP_LESSTHANOREQUAL, - 'OP_GREATERTHANOREQUAL': OP_GREATERTHANOREQUAL, - 'OP_MIN': OP_MIN, - 'OP_MAX': OP_MAX, - 'OP_WITHIN': OP_WITHIN, - 'OP_RIPEMD160': OP_RIPEMD160, - 'OP_SHA1': OP_SHA1, - 'OP_SHA256': OP_SHA256, - 'OP_HASH160': OP_HASH160, - 'OP_HASH256': OP_HASH256, - 'OP_CODESEPARATOR': OP_CODESEPARATOR, - 'OP_CHECKSIG': OP_CHECKSIG, - 'OP_CHECKSIGVERIFY': OP_CHECKSIGVERIFY, - 'OP_CHECKMULTISIG': OP_CHECKMULTISIG, - 'OP_CHECKMULTISIGVERIFY': OP_CHECKMULTISIGVERIFY, - 'OP_CHECKDATASIG': OP_CHECKDATASIG, - 'OP_CHECKDATASIGVERIFY': OP_CHECKDATASIGVERIFY, - 'OP_NOP1': OP_NOP1, - 'OP_CHECKLOCKTIMEVERIFY': OP_CHECKLOCKTIMEVERIFY, - 'OP_CHECKSEQUENCEVERIFY': OP_CHECKSEQUENCEVERIFY, - 'OP_NOP4': OP_NOP4, - 'OP_NOP5': OP_NOP5, - 'OP_NOP6': OP_NOP6, - 'OP_NOP7': OP_NOP7, - 'OP_NOP8': OP_NOP8, - 'OP_NOP9': OP_NOP9, - 'OP_NOP10': OP_NOP10, - 'OP_SMALLINTEGER': OP_SMALLINTEGER, - 'OP_PUBKEYS': OP_PUBKEYS, - 'OP_PUBKEYHASH': OP_PUBKEYHASH, - 'OP_PUBKEY': OP_PUBKEY, -} - class CScriptInvalidError(Exception): """Base class for CScript exceptions""" diff --git a/test/functional/wallet.py b/test/functional/wallet.py --- a/test/functional/wallet.py +++ b/test/functional/wallet.py @@ -233,7 +233,7 @@ signedRawTx = self.nodes[1].signrawtransaction(rawTx) decRawTx = self.nodes[1].decoderawtransaction(signedRawTx['hex']) zeroValueTxid = decRawTx['txid'] - sendResp = self.nodes[1].sendrawtransaction(signedRawTx['hex']) + self.nodes[1].sendrawtransaction(signedRawTx['hex']) self.sync_all() self.nodes[1].generate(1) # mine a block