diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-03-05 19:11:20 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-03-05 19:11:20 +0200 |
| commit | 4f93f745284c10f12e2524f5211030085d9626cf (patch) | |
| tree | 29b5f359a8f346305bcf7bf82f459f421bfaa7a7 /src/cryptonote_basic/miner.h | |
| parent | Merge pull request #3273 (diff) | |
| parent | Wallet API: generalize 'bool testnet' to 'NetworkType nettype' (diff) | |
| download | monero-4f93f745284c10f12e2524f5211030085d9626cf.tar.xz | |
Merge pull request #3277
0e7ad2e2 Wallet API: generalize 'bool testnet' to 'NetworkType nettype' (stoffu)
af773211 Stagenet (stoffu)
cc9a0bee command_line: allow args to depend on more than one args (stoffu)
55f8d917 command_line::get_arg: remove 'required' for dependent args as they're always optional (stoffu)
450306a0 command line: allow has_arg to handle arg_descriptor<bool,false,true> #3318 (stoffu)
9f9e095a Use `genesis_tx` parameter in `generate_genesis_block`. #3261 (Jean Pierre Dudey)
Diffstat (limited to 'src/cryptonote_basic/miner.h')
| -rw-r--r-- | src/cryptonote_basic/miner.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_basic/miner.h b/src/cryptonote_basic/miner.h index 7bf5dc372..2bff784c7 100644 --- a/src/cryptonote_basic/miner.h +++ b/src/cryptonote_basic/miner.h @@ -64,7 +64,7 @@ namespace cryptonote public: miner(i_miner_handler* phandler); ~miner(); - bool init(const boost::program_options::variables_map& vm, bool testnet); + bool init(const boost::program_options::variables_map& vm, network_type nettype); static void init_options(boost::program_options::options_description& desc); bool set_block_template(const block& bl, const difficulty_type& diffic, uint64_t height); bool on_block_chain_update(); |