unified check for nspv full node;

better nLocalServices printing
dimxy · Jun 8, 2021 · 691a18b · 691a18b
1 parent 6763f0e
commit 691a18b
Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/init.cpp b/src/init.cpp
@@ -2017,13 +2017,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             PruneAndFlush();
         }
     }
-    if ( KOMODO_NSPV == 0 )
+    if (KOMODO_NSPV_FULLNODE)
     {
         if ( GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX) != 0 )
             nLocalServices |= NODE_ADDRINDEX;
         if ( GetBoolArg("-spentindex", DEFAULT_SPENTINDEX) != 0 )
             nLocalServices |= NODE_SPENTINDEX;
-        fprintf(stderr,"nLocalServices %llx %d, %d\n",(long long)nLocalServices,GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),GetBoolArg("-spentindex", DEFAULT_SPENTINDEX));
     }
     // ********************************************************* Step 10: import blocks
 
@@ -2111,5 +2110,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     // SENDALERT
     threadGroup.create_thread(boost::bind(ThreadSendAlert));
 
+    if (KOMODO_NSPV_FULLNODE)
+        fprintf(stderr,"nLocalServices %llx %d, %d\n",(long long)nLocalServices,GetBoolArg("-addressindex", DEFAULT_ADDRESSINDEX),GetBoolArg("-spentindex", DEFAULT_SPENTINDEX));
+
     return !fRequestShutdown;
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -7886,7 +7886,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv,
         std::vector<uint8_t> payload;
         vRecv >> payload;
 
-        if (strCommand == "getnSPV" && KOMODO_NSPV == 0) {
+        if (strCommand == "getnSPV" && KOMODO_NSPV_FULLNODE) {
             komodo_nSPVreq(pfrom, payload);
         } else if (strCommand == "nSPV" && KOMODO_NSPV_SUPERLITE) {
             komodo_nSPVresp(pfrom, payload);