mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2024-11-19 09:50:08 +01:00
Code Issues Projects Releases Wiki Activity

txscript: Rename removeOpcodeByDataRaw func.

Browse Source 
This renames the removeOpcodeByDataRaw to removeOpcodeByData now that
the old version has been removed.
This commit is contained in:
Dave Collins 2019-03-13 01:13:00 -05:00 committed by Olaoluwa Osuntokun
parent 07ab66b790
commit 911db90858
No known key found for this signature in database
GPG Key ID: 3BBD59E99B280306
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
txscript/opcode.go
View File

@ -2063,7 +2063,7 @@ func opcodeCheckSig(op *parsedOpcode, vm *Engine) error {
} else {
// Remove the signature since there is no way for a signature
// to sign itself.
subScript = removeOpcodeByDataRaw(subScript, fullSigBytes)
subScript = removeOpcodeByData(subScript, fullSigBytes)
hash = calcSignatureHashRaw(subScript, hashType, &vm.tx, vm.txIdx)
}
@ -2236,7 +2236,7 @@ func opcodeCheckMultiSig(op *parsedOpcode, vm *Engine) error {
// no way for a signature to sign itself.
if !vm.isWitnessVersionActive(0) {
for _, sigInfo := range signatures {
script = removeOpcodeByDataRaw(script, sigInfo.signature)
script = removeOpcodeByData(script, sigInfo.signature)
}
}

4
txscript/script.go
View File

@ -318,7 +318,7 @@ func isCanonicalPush(opcode byte, data []byte) bool {
return true
}
// removeOpcodeByDataRaw will return the script minus any opcodes that perform a
// removeOpcodeByData will return the script minus any opcodes that perform a
// canonical push of data that contains the passed data to remove. This
// function assumes it is provided a version 0 script as any future version of
// script should avoid this functionality since it is unncessary due to the
@ -332,7 +332,7 @@ func isCanonicalPush(opcode byte, data []byte) bool {
// NOTE: This function is only valid for version 0 scripts. Since the function
// does not accept a script version, the results are undefined for other script
// versions.
func removeOpcodeByDataRaw(script []byte, dataToRemove []byte) []byte {
func removeOpcodeByData(script []byte, dataToRemove []byte) []byte {
// Avoid work when possible.
if len(script) == 0 || len(dataToRemove) == 0 {
return script

2
txscript/script_test.go
View File

@ -4136,7 +4136,7 @@ func TestRemoveOpcodeByData(t *testing.T) {
return nil, err
}
return removeOpcodeByDataRaw(script, data), nil
return removeOpcodeByData(script, data), nil
}
for _, test := range tests {