Remove commented out code
This commit is contained in:
19
src/main.cpp
19
src/main.cpp
@@ -1838,11 +1838,6 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
|
||||
return state.Invalid(false, REJECT_DUPLICATE, "already have coins");
|
||||
}
|
||||
|
||||
//if (tx.IsCoinImport() || tx.IsPegsImport()) {
|
||||
// // Inverse of normal case; if input exists, it's been spent
|
||||
// if (ExistsImportTombstone(tx, view))
|
||||
// return state.Invalid(false, REJECT_DUPLICATE, "import tombstone exists");
|
||||
//} else
|
||||
{
|
||||
// do all inputs exist?
|
||||
// Note that this does not check for the presence of actual outputs (see the next check for that),
|
||||
@@ -1965,7 +1960,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
|
||||
dFreeCount += nSize;
|
||||
}
|
||||
|
||||
if (!tx.IsCoinImport() && !tx.IsPegsImport() && fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000 && nFees > nValueOut/19)
|
||||
if (!tx.IsCoinImport() && fRejectAbsurdFee && nFees > ::minRelayTxFee.GetFee(nSize) * 10000 && nFees > nValueOut/19)
|
||||
{
|
||||
string errmsg = strprintf("absurdly high fees %s, %d > %d",
|
||||
hash.ToString(),
|
||||
@@ -2586,12 +2581,6 @@ void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, CTxUndo &txund
|
||||
inputs.SetNullifiers(tx, true);
|
||||
|
||||
inputs.ModifyCoins(tx.GetHash())->FromTx(tx, nHeight); // add outputs
|
||||
|
||||
// Unorthodox state
|
||||
//if (tx.IsCoinImport() || tx.IsPegsImport()) {
|
||||
// // add a tombstone for the burnTx
|
||||
// AddImportTombstone(tx, inputs, nHeight);
|
||||
//}
|
||||
}
|
||||
|
||||
void UpdateCoins(const CTransaction& tx, CCoinsViewCache& inputs, int nHeight)
|
||||
@@ -3044,12 +3033,6 @@ bool DisconnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
else if (tx.IsCoinImport() || tx.IsPegsImport())
|
||||
{
|
||||
RemoveImportTombstone(tx, view);
|
||||
}
|
||||
*/
|
||||
}
|
||||
|
||||
// set the old best Sprout anchor back
|
||||
|
||||
Reference in New Issue
Block a user