GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-20 13:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

More test fixes, reactivation

Browse source
This commit is contained in:
Gregory Sanders 2017-02-16 10:07:31 -05:00
parent 8106c148ca
commit 4bfbc318e4
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/lockedutxo_tests.cpp
View file

@ -32,13 +32,13 @@ BOOST_AUTO_TEST_CASE(Getlocked_validity)
uint256 gen0 = uint256S("0");
CMutableTransaction mtx0;
mtx0.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(1000), CScript()));
mtx0.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(1000), CScript() << OP_TRUE));
CMutableTransaction mtx1;
mtx1.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(100), CScript()));
mtx1.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(100), CScript() << OP_TRUE));
CMutableTransaction mtx2;
mtx2.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(10), CScript()));
mtx2.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(10), CScript() << OP_TRUE));
CMutableTransaction mtx3;
mtx3.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(1), CScript()));
mtx3.vout.push_back(CTxOut(CTxOutAsset(BITCOINID), CTxOutValue(1), CScript() << OP_TRUE));
//Push vout of size 1 for each CCoin
pcoinsTip->ModifyCoins(uint256S("0"))->FromTx(CTransaction(mtx0), 0);

3
src/test/miner_tests.cpp
View file

@ -77,8 +77,6 @@ bool TestSequenceLocks(const CTransaction &tx, int flags)
// Note that this test assumes blockprioritysize is 0.
void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey, std::vector<CTransaction *>& txFirst)
{
return;
/*
// Test the ancestor feerate transaction selection.
TestMemPoolEntryHelper entry;
@ -178,7 +176,6 @@ void TestPackageSelection(const CChainParams& chainparams, CScript scriptPubKey,
mempool.addUnchecked(tx.GetHash(), entry.Fee(10000).FromTx(tx));
pblocktemplate = BlockAssembler(chainparams).CreateNewBlock(scriptPubKey);
BOOST_CHECK(pblocktemplate->block.vtx[8].GetHash() == hashLowFeeTx2);
*/
}
// NOTE: These tests rely on CreateNewBlock doing its own self-validation!