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

[tests] Fix flake8 warnings in blocktools.py

Browse Source
This commit is contained in:
John Newbery 2018-04-20 14:10:12 -04:00
parent b184127db2
commit cab8be5adf
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
test/functional/test_framework/blocktools.py
View File

@ -10,7 +10,24 @@ from .address import (
script_to_p2sh_p2wsh, script_to_p2sh_p2wsh,
script_to_p2wsh, script_to_p2wsh,
) )
from .mininode import * from .messages import (
CBlock,
COIN,
COutPoint,
CTransaction,
CTxIn,
CTxInWitness,
CTxOut,
FromHex,
ToHex,
bytes_to_hex_str,
hash256,
hex_str_to_bytes,
ser_string,
ser_uint256,
sha256,
uint256_from_str,
)
from .script import ( from .script import (
CScript, CScript,
OP_0, OP_0,
@ -24,13 +41,13 @@ from .script import (
from .util import assert_equal from .util import assert_equal
# Create a block (with regtest difficulty) # Create a block (with regtest difficulty)
def create_block(hashprev, coinbase, nTime=None): def create_block(hashprev, coinbase, ntime=None):
block = CBlock() block = CBlock()
if nTime is None: if ntime is None:
import time import time
block.nTime = int(time.time() + 600) block.nTime = int(time.time() + 600)
else: else:
block.nTime = nTime block.nTime = ntime
block.hashPrevBlock = hashprev block.hashPrevBlock = hashprev
block.nBits = 0x207fffff # difficulty retargeting is disabled in REGTEST chainparams block.nBits = 0x207fffff # difficulty retargeting is disabled in REGTEST chainparams
block.vtx.append(coinbase) block.vtx.append(coinbase)
@ -92,7 +109,7 @@ def create_coinbase(height, pubkey = None):
coinbaseoutput.nValue = 50 * COIN coinbaseoutput.nValue = 50 * COIN
halvings = int(height / 150) # regtest halvings = int(height / 150) # regtest
coinbaseoutput.nValue >>= halvings coinbaseoutput.nValue >>= halvings
if (pubkey != None): if (pubkey is not None):
coinbaseoutput.scriptPubKey = CScript([pubkey, OP_CHECKSIG]) coinbaseoutput.scriptPubKey = CScript([pubkey, OP_CHECKSIG])
else: else:
coinbaseoutput.scriptPubKey = CScript([OP_TRUE]) coinbaseoutput.scriptPubKey = CScript([OP_TRUE])
@ -101,35 +118,35 @@ def create_coinbase(height, pubkey = None):
return coinbase return coinbase
# Create a transaction. # Create a transaction.
# If the scriptPubKey is not specified, make it anyone-can-spend. # If the script_pub_key is not specified, make it anyone-can-spend.
def create_transaction(prevtx, n, sig, value, scriptPubKey=CScript()): def create_transaction(prevtx, n, sig, value, script_pub_key=CScript()):
tx = CTransaction() tx = CTransaction()
assert(n < len(prevtx.vout)) assert(n < len(prevtx.vout))
tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff)) tx.vin.append(CTxIn(COutPoint(prevtx.sha256, n), sig, 0xffffffff))
tx.vout.append(CTxOut(value, scriptPubKey)) tx.vout.append(CTxOut(value, script_pub_key))
tx.calc_sha256() tx.calc_sha256()
return tx return tx
def get_legacy_sigopcount_block(block, fAccurate=True): def get_legacy_sigopcount_block(block, accurate=True):
count = 0 count = 0
for tx in block.vtx: for tx in block.vtx:
count += get_legacy_sigopcount_tx(tx, fAccurate) count += get_legacy_sigopcount_tx(tx, accurate)
return count return count
def get_legacy_sigopcount_tx(tx, fAccurate=True): def get_legacy_sigopcount_tx(tx, accurate=True):
count = 0 count = 0
for i in tx.vout: for i in tx.vout:
count += i.scriptPubKey.GetSigOpCount(fAccurate) count += i.scriptPubKey.GetSigOpCount(accurate)
for j in tx.vin: for j in tx.vin:
# scriptSig might be of type bytes, so convert to CScript for the moment # scriptSig might be of type bytes, so convert to CScript for the moment
count += CScript(j.scriptSig).GetSigOpCount(fAccurate) count += CScript(j.scriptSig).GetSigOpCount(accurate)
return count return count
# Create a scriptPubKey corresponding to either a P2WPKH output for the # Create a scriptPubKey corresponding to either a P2WPKH output for the
# given pubkey, or a P2WSH output of a 1-of-1 multisig for the given # given pubkey, or a P2WSH output of a 1-of-1 multisig for the given
# pubkey. Returns the hex encoding of the scriptPubKey. # pubkey. Returns the hex encoding of the scriptPubKey.
def witness_script(use_p2wsh, pubkey): def witness_script(use_p2wsh, pubkey):
if (use_p2wsh == False): if not use_p2wsh:
# P2WPKH instead # P2WPKH instead
pubkeyhash = hash160(hex_str_to_bytes(pubkey)) pubkeyhash = hash160(hex_str_to_bytes(pubkey))
pkscript = CScript([OP_0, pubkeyhash]) pkscript = CScript([OP_0, pubkeyhash])