diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-02-13 19:49:09 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-02-13 19:49:09 +0200 |
| commit | 59c1a3316e520511c1c3c03d68ae8fd99b294cd4 (patch) | |
| tree | fd86c3412666858ee2a789410a5704f5a3aae01e /src/cryptonote_core/blockchain.h | |
| parent | Merge pull request #650 (diff) | |
| parent | unit_tests: fix blockchain unit test after hard fork import fix (diff) | |
| download | monero-59c1a3316e520511c1c3c03d68ae8fd99b294cd4.tar.xz | |
Merge pull request #651
5cb03a1 unit_tests: fix blockchain unit test after hard fork import fix (moneromooo-monero)
759383c hardfork: add a default fork entry for v1 if none exist (moneromooo-monero)
c7f82ec blockchain: initialize m_hardfork to NULL (moneromooo-monero)
8649b9f blockchain_db: pass hard fork object as a simple pointer (moneromooo-monero)
a333c42 core_tests: add tests for hard fork behaviors (MRL-0004) (moneromooo-monero)
945fe90 core_tests: allow setting miner tx max_outs when creating a block (moneromooo-monero)
8e4c2e6 unit_tests: fix hard fork unit test compilation (moneromooo-monero)
9ef5794 blockchain_utilities: remove unused num_blocks variable (moneromooo-monero)
6c8e5c3 blockchain: reset hardfork object when resetting blockchain (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.h')
| -rw-r--r-- | src/cryptonote_core/blockchain.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h index 5299fed99..ab2c8f9e8 100644 --- a/src/cryptonote_core/blockchain.h +++ b/src/cryptonote_core/blockchain.h @@ -58,6 +58,7 @@ namespace cryptonote { class tx_memory_pool; + struct test_options; enum blockchain_db_sync_mode { @@ -91,8 +92,8 @@ namespace cryptonote Blockchain(tx_memory_pool& tx_pool); - bool init(BlockchainDB* db, const bool testnet = false, const bool fakechain = false); - bool init(BlockchainDB* db, HardFork*& hf, const bool testnet = false, const bool fakechain = false); + bool init(BlockchainDB* db, const bool testnet = false, const cryptonote::test_options *test_options = NULL); + bool init(BlockchainDB* db, HardFork*& hf, const bool testnet = false); bool deinit(); void set_checkpoints(checkpoints&& chk_pts) { m_checkpoints = chk_pts; } |