diff options
| author | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-10-31 01:05:58 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2019-10-31 01:25:07 +0000 |
| commit | d31024c2e1634d32cfbf750ce5713b52a1e67707 (patch) | |
| tree | e440ac44d8fb69c6f53d93252814c6b679fc89da /src/cryptonote_basic/miner.h | |
| parent | Merge pull request #6045 (diff) | |
| download | monero-d31024c2e1634d32cfbf750ce5713b52a1e67707.tar.xz | |
cryptonote: untangle dependency from miner to blockchain
It causes link errors at least on mac
Diffstat (limited to '')
| -rw-r--r-- | src/cryptonote_basic/miner.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cryptonote_basic/miner.h b/src/cryptonote_basic/miner.h index 4efbcbec3..ce50d674e 100644 --- a/src/cryptonote_basic/miner.h +++ b/src/cryptonote_basic/miner.h @@ -52,7 +52,7 @@ namespace cryptonote ~i_miner_handler(){}; }; - class Blockchain; + typedef std::function<bool(const cryptonote::block&, uint64_t, unsigned int, crypto::hash&)> get_block_hash_t; /************************************************************************/ /* */ @@ -60,7 +60,7 @@ namespace cryptonote class miner { public: - miner(i_miner_handler* phandler, Blockchain* pbc); + miner(i_miner_handler* phandler, const get_block_hash_t& gbh); ~miner(); bool init(const boost::program_options::variables_map& vm, network_type nettype); static void init_options(boost::program_options::options_description& desc); @@ -76,7 +76,7 @@ namespace cryptonote bool on_idle(); void on_synchronized(); //synchronous analog (for fast calls) - static bool find_nonce_for_given_block(const Blockchain *pbc, block& bl, const difficulty_type& diffic, uint64_t height); + static bool find_nonce_for_given_block(const get_block_hash_t &gbh, block& bl, const difficulty_type& diffic, uint64_t height); void pause(); void resume(); void do_print_hashrate(bool do_hr); @@ -135,7 +135,7 @@ namespace cryptonote std::list<boost::thread> m_threads; epee::critical_section m_threads_lock; i_miner_handler* m_phandler; - Blockchain* m_pbc; + get_block_hash_t m_gbh; account_public_address m_mine_address; epee::math_helper::once_a_time_seconds<5> m_update_block_template_interval; epee::math_helper::once_a_time_seconds<2> m_update_merge_hr_interval; |