Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-09-28 17:39:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

blockchain_and_pool: move to crytonote_core and enforce its usage

Browse source
This commit is contained in:
jeffro256 2023-06-30 14:52:43 -05:00
parent d6f86e58a6
commit ffbf9f4766
No known key found for this signature in database
GPG key ID: 6F79797A6E392442
17 changed files with 64 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/block_weight/block_weight.cpp
View file

@ -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) \
{ \