diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:21:57 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-02-21 11:21:57 +0200 |
commit | 565c99f67083b36e3ba91a79ce97dd74d73ece21 (patch) | |
tree | 2feaaba961e8f856cc966850abbad7574421f2bb /tests/unit_tests | |
parent | Merge pull request #1733 (diff) | |
parent | core: add a missing newline on a string to be logged (diff) | |
download | monero-565c99f67083b36e3ba91a79ce97dd74d73ece21.tar.xz |
Merge pull request #1731
a427235e core: add a missing newline on a string to be logged (moneromooo-monero)
b6a2230e unit_tests: fix minor blockchain_db regression (moneromooo-monero)
c488eca5 hardfork: tone down some logs (moneromooo-monero)
Diffstat (limited to 'tests/unit_tests')
-rw-r--r-- | tests/unit_tests/blockchain_db.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit_tests/blockchain_db.cpp b/tests/unit_tests/blockchain_db.cpp index 8fc10be10..faf4c776f 100644 --- a/tests/unit_tests/blockchain_db.cpp +++ b/tests/unit_tests/blockchain_db.cpp @@ -288,7 +288,7 @@ TYPED_TEST(BlockchainDBTest, AddBlock) ASSERT_TRUE(compare_blocks(this->m_blocks[0], b)); // assert that we can't add the same block twice - ASSERT_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]), BLOCK_EXISTS); + ASSERT_THROW(this->m_db->add_block(this->m_blocks[0], t_sizes[0], t_diffs[0], t_coins[0], this->m_txs[0]), TX_EXISTS); for (auto& h : this->m_blocks[0].tx_hashes) { |