update miner_tests #6563

pull sidhujag wants to merge 2 commits into bitcoin:master from sidhujag:miner_test changing 2 files +70 −114

sidhujag commented at 5:53 PM on August 17, 2015: none

Remove magic nonce's and reuse TestChain100Setup network.

Now no need to manually increment chaintip height as I call ProcessBlock() after CreateBlock().

The FIXME's were fixed so CheckFinalTX(tx1) and CheckFinalTx(tx2) work.

update miner_tests

Remove magic nonce's and reuse TestChain100Setup network.

Now no need to manually increment chaintip height as I call
ProcessBlock() after CreateBlock().

The FIXME's were fixed so CheckFinalTX(tx1) and CheckFinalTx(tx2) work.

22529d432a

fix spacing 9510ae5a5d

in src/test/miner_tests.cpp:None in 22529d432a outdated

  62 | -    CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
  63 | +    CScript scriptPubKey = CScript() <<  ToByteVector(coinbaseKey.GetPubKey()) << OP_CHECKSIG;
  64 |      CBlockTemplate *pblocktemplate;
  65 |      CMutableTransaction tx,tx2;
  66 |      CScript script;
  67 | +	std::vector<unsigned char> vchSig;

sipa commented at 9:21 PM on August 17, 2015:

Indentation?

sidhujag commented at 12:15 AM on August 18, 2015:

weird, I use Visual Studio's as my editor and its showing just fine. I think /t and spaces mixed together may be causing problems? want me to update?

sipa commented at 12:22 AM on August 18, 2015:

Yes, indentation is 4 spaces, nothing else. Thanks!

laanwj added the label Tests on Aug 19, 2015
laanwj commented at 3:39 PM on August 19, 2015: member

Concept ACK, but please squash and use an informative commit message header. Well at least the summary I mean, update miner_tests does not tell much.

in src/test/test_bitcoin.cpp:None in 9510ae5a5d

 115 | @@ -116,10 +116,13 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
 116 |      CBlockTemplate *pblocktemplate = CreateNewBlock(scriptPubKey);
 117 |      CBlock& block = pblocktemplate->block;
 118 |  
 119 | -    // Replace mempool-selected txns with just coinbase plus passed-in txns:
 120 | -    block.vtx.resize(1);
 121 | -    BOOST_FOREACH(const CMutableTransaction& tx, txns)
 122 | -        block.vtx.push_back(tx);
 123 | +    // Replace mempool-selected txns with just coinbase plus passed-in txns if txns is non-empty:

Diapolo commented at 6:15 AM on August 20, 2015:

Nit: Indentation

laanwj commented at 3:59 PM on October 1, 2015: member

Needs rebase + nits addressed
laanwj commented at 8:21 AM on October 6, 2015: member

Closing due to inactivity; let me know if you start work on this again
laanwj closed this on Oct 6, 2015
DrahtBot locked this on Sep 8, 2021

Contributors

Labels