Remove redundant unused variables
This commit is contained in:
parent
66ed242343
commit
99be644966
4 changed files with 1 additions and 5 deletions
|
@ -324,8 +324,6 @@ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys)
|
||||||
|
|
||||||
CScript GetScriptForWitness(const CScript& redeemscript)
|
CScript GetScriptForWitness(const CScript& redeemscript)
|
||||||
{
|
{
|
||||||
CScript ret;
|
|
||||||
|
|
||||||
txnouttype typ;
|
txnouttype typ;
|
||||||
std::vector<std::vector<unsigned char> > vSolutions;
|
std::vector<std::vector<unsigned char> > vSolutions;
|
||||||
if (Solver(redeemscript, typ, vSolutions)) {
|
if (Solver(redeemscript, typ, vSolutions)) {
|
||||||
|
|
|
@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
|
||||||
const CChainParams& chainparams = *chainParams;
|
const CChainParams& chainparams = *chainParams;
|
||||||
CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
|
CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
|
||||||
std::unique_ptr<CBlockTemplate> pblocktemplate;
|
std::unique_ptr<CBlockTemplate> pblocktemplate;
|
||||||
CMutableTransaction tx,tx2;
|
CMutableTransaction tx;
|
||||||
CScript script;
|
CScript script;
|
||||||
uint256 hash;
|
uint256 hash;
|
||||||
TestMemPoolEntryHelper entry;
|
TestMemPoolEntryHelper entry;
|
||||||
|
|
|
@ -547,7 +547,6 @@ BOOST_AUTO_TEST_CASE(test_witness)
|
||||||
|
|
||||||
CTransactionRef output1, output2;
|
CTransactionRef output1, output2;
|
||||||
CMutableTransaction input1, input2;
|
CMutableTransaction input1, input2;
|
||||||
SignatureData sigdata;
|
|
||||||
|
|
||||||
// Normal pay-to-compressed-pubkey.
|
// Normal pay-to-compressed-pubkey.
|
||||||
CreateCreditAndSpend(keystore, scriptPubkey1, output1, input1);
|
CreateCreditAndSpend(keystore, scriptPubkey1, output1, input1);
|
||||||
|
|
|
@ -716,7 +716,6 @@ void CTxMemPool::check(const CCoinsViewCache *pcoins) const
|
||||||
while (!waitingOnDependants.empty()) {
|
while (!waitingOnDependants.empty()) {
|
||||||
const CTxMemPoolEntry* entry = waitingOnDependants.front();
|
const CTxMemPoolEntry* entry = waitingOnDependants.front();
|
||||||
waitingOnDependants.pop_front();
|
waitingOnDependants.pop_front();
|
||||||
CValidationState state;
|
|
||||||
if (!mempoolDuplicate.HaveInputs(entry->GetTx())) {
|
if (!mempoolDuplicate.HaveInputs(entry->GetTx())) {
|
||||||
waitingOnDependants.push_back(entry);
|
waitingOnDependants.push_back(entry);
|
||||||
stepsSinceLastRemove++;
|
stepsSinceLastRemove++;
|
||||||
|
|
Loading…
Reference in a new issue