unit_tests: fix blockchain unit test after hard fork import fix

This commit is contained in:
moneromooo-monero 2016-02-08 20:58:43 +00:00
parent 759383c52d
commit 5cb03a15be
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3

View File

@ -155,7 +155,7 @@ template <typename T>
class BlockchainDBTest : public testing::Test class BlockchainDBTest : public testing::Test
{ {
protected: protected:
BlockchainDBTest() : m_db(new T()) BlockchainDBTest() : m_db(new T()), m_hardfork(*m_db, 1, 0)
{ {
for (auto& i : t_blocks) for (auto& i : t_blocks)
{ {
@ -184,11 +184,18 @@ protected:
} }
BlockchainDB* m_db; BlockchainDB* m_db;
HardFork m_hardfork;
std::string m_prefix; std::string m_prefix;
std::vector<block> m_blocks; std::vector<block> m_blocks;
std::vector<std::vector<transaction> > m_txs; std::vector<std::vector<transaction> > m_txs;
std::vector<std::string> m_filenames; std::vector<std::string> m_filenames;
void init_hard_fork()
{
m_hardfork.init();
m_db->set_hard_fork(&m_hardfork);
}
void get_filenames() void get_filenames()
{ {
m_filenames = m_db->get_filenames(); m_filenames = m_db->get_filenames();
@ -257,6 +264,7 @@ TYPED_TEST(BlockchainDBTest, AddBlock)
// make sure open does not throw // make sure open does not throw
ASSERT_NO_THROW(this->m_db->open(fname)); ASSERT_NO_THROW(this->m_db->open(fname));
this->get_filenames(); this->get_filenames();
this->init_hard_fork();
// adding a block with no parent in the blockchain should throw. // adding a block with no parent in the blockchain should throw.
// note: this shouldn't be possible, but is a good (and cheap) failsafe. // note: this shouldn't be possible, but is a good (and cheap) failsafe.
@ -300,6 +308,7 @@ TYPED_TEST(BlockchainDBTest, RetrieveBlockData)
// make sure open does not throw // make sure open does not throw
ASSERT_NO_THROW(this->m_db->open(fname)); ASSERT_NO_THROW(this->m_db->open(fname));
this->get_filenames(); this->get_filenames();
this->init_hard_fork();
ASSERT_NO_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0])); ASSERT_NO_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]));