tiamak/salvium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3854

Browse Source 
149da42 db_lmdb: enable batch transactions by default (stoffu)
34cb6b4 add --regtest and --fixed-difficulty for regression testing (vicsn)
9e1403e update get_info RPC and bump RPC version (vicsn)
207b66e first new functional tests (vicsn)
This commit is contained in:
luigi1111
2018-07-19 13:35:25 -05:00
parent 33122ab8a6 207b66ecc2
commit 025187e6c9
27 changed files with 719 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/main.cpp
+3 -2
View File
@@ -163,9 +163,10 @@ int main(int argc, char const * argv[])
const bool testnet = command_line::get_arg(vm, cryptonote::arg_testnet_on);
const bool stagenet = command_line::get_arg(vm, cryptonote::arg_stagenet_on);
if (testnet && stagenet)
const bool regtest = command_line::get_arg(vm, cryptonote::arg_regtest_on);
if (testnet + stagenet + regtest > 1)
{
std::cerr << "Can't specify more than one of --tesnet and --stagenet" << ENDL;
std::cerr << "Can't specify more than one of --tesnet and --stagenet and --regtest" << ENDL;
return 1;
}