test: Remove FindAndDelete from RPC test framework
This commit is contained in:
parent
8bc0a591a0
commit
bbed3ecc3c
|
@ -340,7 +340,6 @@ VALID_OPCODES = {
|
||||||
OP_SHA256,
|
OP_SHA256,
|
||||||
OP_HASH160,
|
OP_HASH160,
|
||||||
OP_HASH256,
|
OP_HASH256,
|
||||||
OP_CODESEPARATOR,
|
|
||||||
OP_CHECKSIG,
|
OP_CHECKSIG,
|
||||||
OP_CHECKSIGVERIFY,
|
OP_CHECKSIGVERIFY,
|
||||||
OP_CHECKMULTISIG,
|
OP_CHECKMULTISIG,
|
||||||
|
@ -821,23 +820,6 @@ SIGHASH_NONE = 2
|
||||||
SIGHASH_SINGLE = 3
|
SIGHASH_SINGLE = 3
|
||||||
SIGHASH_ANYONECANPAY = 0x80
|
SIGHASH_ANYONECANPAY = 0x80
|
||||||
|
|
||||||
def FindAndDelete(script, sig):
|
|
||||||
"""Consensus critical, see FindAndDelete() in Satoshi codebase"""
|
|
||||||
r = b''
|
|
||||||
last_sop_idx = sop_idx = 0
|
|
||||||
skip = True
|
|
||||||
for (opcode, data, sop_idx) in script.raw_iter():
|
|
||||||
if not skip:
|
|
||||||
r += script[last_sop_idx:sop_idx]
|
|
||||||
last_sop_idx = sop_idx
|
|
||||||
if script[sop_idx:sop_idx + len(sig)] == sig:
|
|
||||||
skip = True
|
|
||||||
else:
|
|
||||||
skip = False
|
|
||||||
if not skip:
|
|
||||||
r += script[last_sop_idx:]
|
|
||||||
return CScript(r)
|
|
||||||
|
|
||||||
|
|
||||||
def SignatureHash(script, txTo, inIdx, hashtype):
|
def SignatureHash(script, txTo, inIdx, hashtype):
|
||||||
"""Consensus-correct SignatureHash
|
"""Consensus-correct SignatureHash
|
||||||
|
@ -853,7 +835,7 @@ def SignatureHash(script, txTo, inIdx, hashtype):
|
||||||
|
|
||||||
for txin in txtmp.vin:
|
for txin in txtmp.vin:
|
||||||
txin.scriptSig = b''
|
txin.scriptSig = b''
|
||||||
txtmp.vin[inIdx].scriptSig = FindAndDelete(script, CScript([OP_CODESEPARATOR]))
|
txtmp.vin[inIdx].scriptSig = script
|
||||||
|
|
||||||
if (hashtype & 0x1f) == SIGHASH_NONE:
|
if (hashtype & 0x1f) == SIGHASH_NONE:
|
||||||
txtmp.vout = []
|
txtmp.vout = []
|
||||||
|
|
Loading…
Reference in New Issue