Sanitize AreInputsStandard slightly

Correct comment for why the check is unnecessary for coinbases
Move testnet check out, to AcceptToMemoryPool where everything else checks it
This commit is contained in:
Luke Dashjr 2012-01-20 20:59:04 -05:00
parent 1240a1b0a8
commit 575bdcde93
1 changed files with 2 additions and 5 deletions

View File

@ -277,11 +277,8 @@ bool CTransaction::IsStandard() const
//
bool CTransaction::AreInputsStandard(const MapPrevTx& mapInputs) const
{
if (fTestNet)
return true; // Allow non-standard on testnet
if (IsCoinBase())
return true; // Coinbases are allowed to have any input
return true; // Coinbases don't use vin normally
for (int i = 0; i < vin.size(); i++)
{
@ -500,7 +497,7 @@ bool CTransaction::AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs, bool* pfMi
}
// Check for non-standard pay-to-script-hash in inputs
if (!AreInputsStandard(mapInputs))
if (!AreInputsStandard(mapInputs) && !fTestNet)
return error("AcceptToMemoryPool() : nonstandard transaction input");
int64 nFees = GetValueIn(mapInputs)-GetValueOut();