mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-09-11 14:32:13 +00:00
Fixed unit test cases after change of hash calculation.
This commit is contained in:
parent
68ffbfc104
commit
33ed36e5bf
@ -48,7 +48,7 @@ static CBlock BuildBlockTestCase() {
|
|||||||
block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
|
block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
|
||||||
assert(!mutated);
|
assert(!mutated);
|
||||||
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
||||||
block.cnHeader.prev_id = block.GetHash();
|
block.cnHeader.prev_id = block.GetOriginalBlockHash();
|
||||||
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.cnHeader.nonce;
|
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.cnHeader.nonce;
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
@ -295,7 +295,7 @@ BOOST_AUTO_TEST_CASE(EmptyBlockRoundTripTest)
|
|||||||
block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
|
block.hashMerkleRoot = BlockMerkleRoot(block, &mutated);
|
||||||
assert(!mutated);
|
assert(!mutated);
|
||||||
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
||||||
block.cnHeader.prev_id = block.GetHash();
|
block.cnHeader.prev_id = block.GetOriginalHash();
|
||||||
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.cnHeader.nonce;
|
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, Params().GetConsensus())) ++block.cnHeader.nonce;
|
||||||
|
|
||||||
// Test simple header round-trip with only coinbase
|
// Test simple header round-trip with only coinbase
|
||||||
|
@ -155,7 +155,7 @@ TestChain100Setup::CreateAndProcessBlock(const std::vector<CMutableTransaction>&
|
|||||||
}
|
}
|
||||||
|
|
||||||
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
block.cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
||||||
block.cnHeader.prev_id = block.GetHash();
|
block.cnHeader.prev_id = block.GetOriginalBlockHash();
|
||||||
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, chainparams.GetConsensus())) ++block.cnHeader.nonce;
|
while (!CheckProofOfWork(block.GetPoWHash(), block.nBits, chainparams.GetConsensus())) ++block.cnHeader.nonce;
|
||||||
|
|
||||||
std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
|
std::shared_ptr<const CBlock> shared_pblock = std::make_shared<const CBlock>(block);
|
||||||
|
@ -75,11 +75,10 @@ std::shared_ptr<CBlock> FinalizeBlock(std::shared_ptr<CBlock> pblock)
|
|||||||
pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
|
pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
|
||||||
|
|
||||||
pblock->cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
pblock->cnHeader.major_version = Params().GetConsensus().GetCryptonoteMajorVersion();
|
||||||
pblock->cnHeader.prev_id = pblock->GetHash();
|
pblock->cnHeader.prev_id = pblock->GetOriginalBlockHash();
|
||||||
while (!CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, Params().GetConsensus())) {
|
while (!CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, Params().GetConsensus())) {
|
||||||
++(pblock->cnHeader.nonce);
|
++(pblock->cnHeader.nonce);
|
||||||
}
|
}
|
||||||
|
|
||||||
return pblock;
|
return pblock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user