Use DEFAULT_BLOCKSONLY and DEFAULT_WHITELISTALWAYSRELAY constants

pstratem · pstratem · commit 71a2683f4b52 · 2015-11-14T05:10:59.000-08:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -821,7 +821,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     // disable walletbroadcast in blocksonly mode
-    if (GetBoolArg("-blocksonly", false)) {
+    if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
         if (SoftSetBoolArg("-whitelistalwaysrelay", false))
             LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);
 #ifdef ENABLE_WALLET
diff --git a/src/main.cpp b/src/main.cpp
@@ -4218,7 +4218,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
             bool fAlreadyHave = AlreadyHave(inv);
             LogPrint("net", "got inv: %s  %s peer=%d\n", inv.ToString(), fAlreadyHave ? "have" : "new", pfrom->id);
 
-            if (!fAlreadyHave && !fImporting && !fReindex && inv.type != MSG_BLOCK && !GetBoolArg("-blocksonly", false))
+            if (!fAlreadyHave && !fImporting && !fReindex && inv.type != MSG_BLOCK && !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY))
                 pfrom->AskFor(inv);
 
             if (inv.type == MSG_BLOCK) {
diff --git a/src/net.cpp b/src/net.cpp
@@ -460,7 +460,7 @@ void CNode::PushVersion()
     else
         LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);
     PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
-                nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", false));
+                nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY));
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -821,7 +821,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`821`	`821`	`}`
`822`	`822`
`823`	`823`	`// disable walletbroadcast in blocksonly mode`
`824`		`- if (GetBoolArg("-blocksonly", false)) {`
	`824`	`+ if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {`
`825`	`825`	`if (SoftSetBoolArg("-whitelistalwaysrelay", false))`
`826`	`826`	`LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -whitelistalwaysrelay=0\n", __func__);`
`827`	`827`	`#ifdef ENABLE_WALLET`
Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ void CNode::PushVersion()`
`460`	`460`	`else`
`461`	`461`	`LogPrint("net", "send version message: version %d, blocks=%d, us=%s, peer=%d\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), id);`
`462`	`462`	`PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,`
`463`		`- nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", false));`
	`463`	`+ nLocalHostNonce, strSubVersion, nBestHeight, !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY));`
`464`	`464`	`}`
`465`	`465`
`466`	`466`