oxen-io/oxen-core
2
1
Fork 0
mirror of https://github.com/oxen-io/oxen-core.git synced 2023-12-14 02:22:56 +01:00
Code Issues Projects Releases Wiki Activity

Misc. wording/typo fixes

Browse source
This commit is contained in:
Jason Rhinelander 2020-08-11 19:04:05 -03:00
parent 963f22c1f2
commit 0b62b33e09
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/main.cpp
View file

@ -160,7 +160,7 @@ int main(int argc, char const * argv[])
const bool regtest = command_line::get_arg(vm, cryptonote::arg_regtest_on);
if (testnet + devnet + regtest > 1)
{
std::cerr << "Can't specify more than one of --tesnet and --devnet and --regtest\n";
std::cerr << "Can't specify more than one of --testnet and --devnet and --regtest\n";
return 1;
}

4
src/loki_economy.h
View file

@ -26,8 +26,8 @@ constexpr uint64_t FOUNDATION_REWARD_HF16 = BLOCK_REWARD_HF16 * 10 / 100;
// to keep the current test suite happy until we actually implement this for HF16.
constexpr uint64_t MINER_REWARD_HF16 = 1;
static_assert(MINER_REWARD_HF15 + SN_REWARD_HF15 + FOUNDATION_REWARD_HF15 == BLOCK_REWARD_HF15, "math fail");
static_assert(MINER_REWARD_HF16 + SN_REWARD_HF16 + FOUNDATION_REWARD_HF16 == BLOCK_REWARD_HF16, "math fail");
static_assert(MINER_REWARD_HF15 + SN_REWARD_HF15 + FOUNDATION_REWARD_HF15 == BLOCK_REWARD_HF15);
static_assert(MINER_REWARD_HF16 + SN_REWARD_HF16 + FOUNDATION_REWARD_HF16 == BLOCK_REWARD_HF16);
// -------------------------------------------------------------------------------------------------
//

2
src/wallet/wallet2.cpp
View file

@ -5811,7 +5811,7 @@ void wallet2::trim_hashchain()
}
//----------------------------------------------------------------------------------------------------
void wallet2::check_genesis(const crypto::hash& genesis_hash) const {
std::string what("Genesis block mismatch. You probably use wallet without testnet (or devnet) flag with blockchain from test (or dev) network or vice versa");
std::string what("Genesis block mismatch. (Perhaps you forgot to use --testnet or --stagenet for a testnet/stagenet wallet?)");
THROW_WALLET_EXCEPTION_IF(genesis_hash != m_blockchain.genesis(), error::wallet_internal_error, what);
}