From b815600295bd5e7b274c8ee32da65f1419a79ab2 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Fri, 8 Jun 2018 14:39:36 -0700 Subject: Remove CombineSignatures and replace tests Removes CombineSignatures and replaces its use in tests with ProduceSignature to test the same behavior for ProduceSignature. --- src/script/sign.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/script/sign.h') 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); -- cgit v1.2.3