Remove remaining references to BIP70

Fuzzbawls · Fuzzbawls · commit 6e25d8320eb9 · 2021-04-16T16:52:19.000-07:00
in comments, rpc output, and the REST doc
diff --git a/doc/REST-interface.md b/doc/REST-interface.md
@@ -33,7 +33,7 @@ Given a block hash: returns <COUNT> amount of blockheaders in upward direction.
 
 Returns various state info regarding block chain processing.
 Only supports JSON as output format.
-* chain : (string) current network name as defined in BIP70 (main, test, regtest)
+* chain : (string) current network name (main, test, regtest)
 * blocks : (numeric) the current number of blocks processed in the server
 * headers : (numeric) the current number of headers we have validated
 * bestblockhash : (string) the hash of the currently best block
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -75,7 +75,7 @@ class CChainParams
     /** Default value for -checkmempool and -checkblockindex argument */
     bool DefaultConsistencyChecks() const { return IsRegTestNet(); }
 
-    /** Return the BIP70 network string (main, test or regtest) */
+    /** Return the network string */
     std::string NetworkIDString() const { return strNetworkID; }
     const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
     const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
@@ -115,7 +115,7 @@ std::unique_ptr<CChainParams> CreateChainParams(const std::string& chain);
 const CChainParams& Params();
 
 /**
- * Sets the params returned by Params() to those for the given BIP70 chain name.
+ * Sets the params returned by Params() to those for the given chain name.
  * @throws std::runtime_error when the chain is not supported.
  */
 void SelectParams(const std::string& chain);
diff --git a/src/chainparamsbase.h b/src/chainparamsbase.h
@@ -17,10 +17,12 @@
 class CBaseChainParams
 {
 public:
-    /** BIP70 chain name strings (main, test or regtest) */
+    ///@{
+    /** Chain name strings */
     static const std::string MAIN;
     static const std::string TESTNET;
     static const std::string REGTEST;
+    ///@}
 
     const std::string& DataDir() const { return strDataDir; }
     int RPCPort() const { return nRPCPort; }
@@ -55,7 +57,7 @@ const CBaseChainParams& BaseParams();
 void SelectBaseParams(const std::string& chain);
 
 /**
- * Looks for -regtest, -testnet and returns the appropriate BIP70 chain name.
+ * Returns the appropriate chain name from the program arguments.
  * @return CBaseChainParams::MAX_NETWORK_TYPES if an invalid combination is given. CBaseChainParams::MAIN by default.
  */
 std::string ChainNameFromCommandLine();
diff --git a/src/qt/networkstyle.h b/src/qt/networkstyle.h
@@ -13,7 +13,7 @@
 class NetworkStyle
 {
 public:
-    /** Get style associated with provided BIP70 network id, or 0 if not known */
+    /** Get style associated with provided network id, or 0 if not known */
     static const NetworkStyle* instantiate(const QString& networkId);
 
     const QString& getAppName() const { return appName; }
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -982,7 +982,7 @@ UniValue getblockchaininfo(const JSONRPCRequest& request)
 
             "\nResult:\n"
             "{\n"
-            "  \"chain\": \"xxxx\",        (string) current network name as defined in BIP70 (main, test, regtest)\n"
+            "  \"chain\": \"xxxx\",        (string) current network name (main, test, regtest)\n"
             "  \"blocks\": xxxxxx,         (numeric) the current number of blocks processed in the server\n"
             "  \"headers\": xxxxxx,        (numeric) the current number of headers we have validated\n"
             "  \"bestblockhash\": \"...\", (string) the hash of the currently best block\n"
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
@@ -300,7 +300,7 @@ UniValue getmininginfo(const JSONRPCRequest& request)
             "  \"hashespersec\": n          (numeric) The hashes per second of the generation, or 0 if no generation.\n"
             "  \"pooledtx\": n              (numeric) The size of the mem pool\n"
             "  \"testnet\": true|false      (boolean) If using testnet or not\n"
-            "  \"chain\": \"xxxx\",         (string) current network name as defined in BIP70 (main, test, regtest)\n"
+            "  \"chain\": \"xxxx\",         (string) current network name (main, test, regtest)\n"
             "}\n"
 
             "\nExamples:\n" +

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class NetworkStyle`
`14`	`14`	`{`
`15`	`15`	`public:`
`16`		`- /** Get style associated with provided BIP70 network id, or 0 if not known */`
	`16`	`+ /** Get style associated with provided network id, or 0 if not known */`
`17`	`17`	`static const NetworkStyle* instantiate(const QString& networkId);`
`18`	`18`
`19`	`19`	`const QString& getAppName() const { return appName; }`