aboutsummaryrefslogtreecommitdiff
path: root/src/script/sign.h
diff options
context:
space:
mode:
authorAndrew Chow <achow101-github@achow101.com>2018-06-08 14:39:36 -0700
committerAndrew Chow <achow101-github@achow101.com>2018-07-03 17:19:23 -0700
commitb815600295bd5e7b274c8ee32da65f1419a79ab2 (patch)
treebed1faba88d6e329c537c584c61a2986f28dc478 /src/script/sign.h
parented94c8b556dbbfb62452eaefd9ee7841df09777a (diff)
Remove CombineSignatures and replace tests
Removes CombineSignatures and replaces its use in tests with ProduceSignature to test the same behavior for ProduceSignature.
Diffstat (limited to 'src/script/sign.h')
-rw-r--r--src/script/sign.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/script/sign.h b/src/script/sign.h
index c8bccc432f..3666859641 100644
--- a/src/script/sign.h
+++ b/src/script/sign.h
@@ -80,9 +80,6 @@ bool ProduceSignature(const SigningProvider& provider, const BaseSignatureCreato
bool SignSignature(const SigningProvider &provider, const CScript& fromPubKey, CMutableTransaction& txTo, unsigned int nIn, const CAmount& amount, int nHashType);
bool SignSignature(const SigningProvider &provider, const CTransaction& txFrom, CMutableTransaction& txTo, unsigned int nIn, int nHashType);
-/** Combine two script signatures using a generic signature checker, intelligently, possibly with OP_0 placeholders. */
-SignatureData CombineSignatures(const CScript& scriptPubKey, const BaseSignatureChecker& checker, const SignatureData& scriptSig1, const SignatureData& scriptSig2);
-
/** Extract signature data from a transaction input, and insert it. */
SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nIn, const CTxOut& txout);
void UpdateInput(CTxIn& input, const SignatureData& data);