Don't inbclude listen port and testnet option into autogenerated config file.
authoralex <balthazar@yandex.ru>
Fri, 19 Feb 2016 17:39:31 +0000 (20:39 +0300)
committeralex <balthazar@yandex.ru>
Fri, 19 Feb 2016 17:39:31 +0000 (20:39 +0300)
src/protocol.h
src/util.cpp

index b4ebac6..ece6184 100644 (file)
@@ -17,9 +17,9 @@
 #include "uint256.h"
 
 extern bool fTestNet;
-static inline unsigned short GetDefaultPort(const bool testnet = fTestNet)
+inline unsigned short GetDefaultPort()
 {
-    return static_cast<unsigned short>(testnet ? 17777 : 7777);
+    return static_cast<unsigned short>(fTestNet ? 17777 : 7777);
 }
 
 
index 7fb43bc..73621d8 100644 (file)
@@ -1180,13 +1180,11 @@ void createConf()
     pConf << "rpcuser=user\nrpcpassword="
             + randomStrGen(15)
             + "\nrpcport=8344"
-            + "\nport=7777"
             + "\n#(0=off, 1=on) daemon - run in the background as a daemon and accept commands"
             + "\ndaemon=0"
             + "\n#(0=off, 1=on) server - accept command line and JSON-RPC commands"
             + "\nserver=0"
-            + "\nrpcallowip=127.0.0.1"
-            + "\ntestnet=0";
+            + "\nrpcallowip=127.0.0.1";
     pConf.close();
 }