diff options
| author | jeffro256 <jeffro256@tutanota.com> | 2023-06-30 14:52:43 -0500 |
|---|---|---|
| committer | jeffro256 <jeffro256@tutanota.com> | 2023-07-01 07:12:53 -0500 |
| commit | ffbf9f4766945f33b80366c414a5721ce90e5a2e (patch) | |
| tree | ad1a816d0dde18062afaad3357e88ef0d062375a /tests/block_weight/block_weight.cpp | |
| parent | Avoid nullptr dereference when constructing Blockchain and tx_memory_pool (diff) | |
| download | monero-ffbf9f4766945f33b80366c414a5721ce90e5a2e.tar.xz | |
blockchain_and_pool: move to crytonote_core and enforce its usage
Diffstat (limited to '')
| -rw-r--r-- | tests/block_weight/block_weight.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/tests/block_weight/block_weight.cpp b/tests/block_weight/block_weight.cpp index 7cd0d572b..4b00fc63f 100644 --- a/tests/block_weight/block_weight.cpp +++ b/tests/block_weight/block_weight.cpp @@ -30,8 +30,6 @@ #include <stdio.h> #include <math.h> -#include "cryptonote_core/blockchain.h" -#include "cryptonote_core/tx_pool.h" #include "cryptonote_core/cryptonote_core.h" #include "blockchain_db/testdb.h" @@ -110,9 +108,6 @@ private: } #define PREFIX_WINDOW(hf_version,window) \ - std::unique_ptr<cryptonote::Blockchain> bc; \ - cryptonote::tx_memory_pool txpool(*bc); \ - bc.reset(new cryptonote::Blockchain(txpool)); \ struct get_test_options { \ const std::pair<uint8_t, uint64_t> hard_forks[3]; \ const cryptonote::test_options test_options = { \ @@ -121,7 +116,9 @@ private: }; \ get_test_options(): hard_forks{std::make_pair(1, (uint64_t)0), std::make_pair((uint8_t)hf_version, (uint64_t)LONG_TERM_BLOCK_WEIGHT_WINDOW), std::make_pair((uint8_t)0, (uint64_t)0)} {} \ } opts; \ - cryptonote::Blockchain *blockchain = bc.get(); \ + cryptonote::BlockchainAndPool bap; \ + cryptonote::Blockchain *blockchain = &bap.blockchain; \ + cryptonote::Blockchain *bc = blockchain; \ bool r = blockchain->init(new TestDB(), cryptonote::FAKECHAIN, true, &opts.test_options, 0, NULL); \ if (!r) \ { \ |