Don't make "in" parameters look like "out"/"in-out" parameters: pass by ref to const instead of ref to non-const

practicalswift · practicalswift · commit 12dcdaaa54b9 · 2020-12-06T00:22:40.000Z
diff --git a/src/init.cpp b/src/init.cpp
@@ -914,7 +914,7 @@ std::set<BlockFilterType> g_enabled_filter_types;
     std::terminate();
 };
 
-bool AppInitBasicSetup(ArgsManager& args)
+bool AppInitBasicSetup(const ArgsManager& args)
 {
     // ********************************************************* Step 1: setup
 #ifdef _MSC_VER
diff --git a/src/init.h b/src/init.h
@@ -33,7 +33,7 @@ void InitParameterInteraction(ArgsManager& args);
  *  @note This can be done before daemonization. Do not call Shutdown() if this function fails.
  *  @pre Parameters should be parsed and config file should be read.
  */
-bool AppInitBasicSetup(ArgsManager& args);
+bool AppInitBasicSetup(const ArgsManager& args);
 /**
  * Initialization: parameter interaction.
  * @note This can be done before daemonization. Do not call Shutdown() if this function fails.
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
@@ -112,7 +112,7 @@ bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, CoinStatsHashType hash_t
 }
 
 // The legacy hash serializes the hashBlock
-static void PrepareHash(CHashWriter& ss, CCoinsStats& stats)
+static void PrepareHash(CHashWriter& ss, const CCoinsStats& stats)
 {
     ss << stats.hashBlock;
 }
diff --git a/src/rpc/rawtransaction_util.cpp b/src/rpc/rawtransaction_util.cpp
@@ -286,7 +286,7 @@ void SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore,
     SignTransactionResultToJSON(mtx, complete, coins, input_errors, result);
 }
 
-void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, std::map<int, std::string>& input_errors, UniValue& result)
+void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, const std::map<int, std::string>& input_errors, UniValue& result)
 {
     // Make errors UniValue
     UniValue vErrors(UniValue::VARR);
diff --git a/src/rpc/rawtransaction_util.h b/src/rpc/rawtransaction_util.h
@@ -25,7 +25,7 @@ class SigningProvider;
  * @param result         JSON object where signed transaction results accumulate
  */
 void SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore, const std::map<COutPoint, Coin>& coins, const UniValue& hashType, UniValue& result);
-void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, std::map<int, std::string>& input_errors, UniValue& result);
+void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, const std::map<int, std::string>& input_errors, UniValue& result);
 
 /**
   * Parse a prevtxs UniValue array and get the map of coins from it
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
@@ -66,7 +66,7 @@ class CSignatureCache
         return setValid.contains(entry, erase);
     }
 
-    void Set(uint256& entry)
+    void Set(const uint256& entry)
     {
         boost::unique_lock<boost::shared_mutex> lock(cs_sigcache);
         setValid.insert(entry);
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
@@ -71,7 +71,7 @@ class CAddrManTest : public CAddrMan
     }
 
     // Simulates connection failure so that we can test eviction of offline nodes
-    void SimConnFail(CService& addr)
+    void SimConnFail(const CService& addr)
     {
          LOCK(cs);
          int64_t nLastSuccess = 1;
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
@@ -75,7 +75,7 @@ class CAddrManCorrupted : public CAddrManSerializationMock
     }
 };
 
-static CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman)
+static CDataStream AddrmanToStream(const CAddrManSerializationMock& _addrman)
 {
     CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);
     ssPeersIn << Params().MessageStart();
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -1860,7 +1860,7 @@ BOOST_AUTO_TEST_CASE(test_Capitalize)
     BOOST_CHECK_EQUAL(Capitalize("\x00\xfe\xff"), "\x00\xfe\xff");
 }
 
-static std::string SpanToStr(Span<const char>& span)
+static std::string SpanToStr(const Span<const char>& span)
 {
     return std::string(span.begin(), span.end());
 }
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -505,13 +505,13 @@ class MemPoolAccept
 
     // Run the script checks using our policy flags. As this can be slow, we should
     // only invoke this on transactions that have otherwise passed policy checks.
-    bool PolicyScriptChecks(ATMPArgs& args, Workspace& ws, PrecomputedTransactionData& txdata) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    bool PolicyScriptChecks(ATMPArgs& args, const Workspace& ws, PrecomputedTransactionData& txdata) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     // Re-run the script checks, using consensus flags, and try to cache the
     // result in the scriptcache. This should be done after
     // PolicyScriptChecks(). This requires that all inputs either be in our
     // utxo set or in the mempool.
-    bool ConsensusScriptChecks(ATMPArgs& args, Workspace& ws, PrecomputedTransactionData &txdata) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
+    bool ConsensusScriptChecks(ATMPArgs& args, const Workspace& ws, PrecomputedTransactionData &txdata) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
 
     // Try to add the transaction to the mempool, removing any conflicts first.
     // Returns true if the transaction is in the mempool after any size
@@ -921,7 +921,7 @@ bool MemPoolAccept::PreChecks(ATMPArgs& args, Workspace& ws)
     return true;
 }
 
-bool MemPoolAccept::PolicyScriptChecks(ATMPArgs& args, Workspace& ws, PrecomputedTransactionData& txdata)
+bool MemPoolAccept::PolicyScriptChecks(ATMPArgs& args, const Workspace& ws, PrecomputedTransactionData& txdata)
 {
     const CTransaction& tx = *ws.m_ptx;
 
@@ -948,7 +948,7 @@ bool MemPoolAccept::PolicyScriptChecks(ATMPArgs& args, Workspace& ws, Precompute
     return true;
 }
 
-bool MemPoolAccept::ConsensusScriptChecks(ATMPArgs& args, Workspace& ws, PrecomputedTransactionData& txdata)
+bool MemPoolAccept::ConsensusScriptChecks(ATMPArgs& args, const Workspace& ws, PrecomputedTransactionData& txdata)
 {
     const CTransaction& tx = *ws.m_ptx;
     const uint256& hash = ws.m_hash;
diff --git a/src/wallet/feebumper.cpp b/src/wallet/feebumper.cpp
@@ -111,7 +111,7 @@ static feebumper::Result CheckFeeRate(const CWallet& wallet, const CWalletTx& wt
     return feebumper::Result::OK;
 }
 
-static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, const CAmount old_fee, CCoinControl& coin_control)
+static CFeeRate EstimateFeeRate(const CWallet& wallet, const CWalletTx& wtx, const CAmount old_fee, const CCoinControl& coin_control)
 {
     // Get the fee rate of the original transaction. This is calculated from
     // the tx fee/vsize, so it may have been rounded down. Add 1 satoshi to the
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
@@ -77,7 +77,7 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)
 }
 
 //! Construct wallet tx status struct.
-WalletTxStatus MakeWalletTxStatus(CWallet& wallet, const CWalletTx& wtx)
+WalletTxStatus MakeWalletTxStatus(const CWallet& wallet, const CWalletTx& wtx)
 {
     WalletTxStatus result;
     result.block_height = wtx.m_confirm.block_height > 0 ? wtx.m_confirm.block_height : std::numeric_limits<int>::max();
@@ -94,7 +94,7 @@ WalletTxStatus MakeWalletTxStatus(CWallet& wallet, const CWalletTx& wtx)
 }
 
 //! Construct wallet TxOut struct.
-WalletTxOut MakeWalletTxOut(CWallet& wallet,
+WalletTxOut MakeWalletTxOut(const CWallet& wallet,
     const CWalletTx& wtx,
     int n,
     int depth) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)

Original file line number	Diff line number	Diff line change
`@@ -914,7 +914,7 @@ std::set<BlockFilterType> g_enabled_filter_types;`
`914`	`914`	`std::terminate();`
`915`	`915`	`};`
`916`	`916`
`917`		`-bool AppInitBasicSetup(ArgsManager& args)`
	`917`	`+bool AppInitBasicSetup(const ArgsManager& args)`
`918`	`918`	`{`
`919`	`919`	`// ********************************************************* Step 1: setup`
`920`	`920`	`#ifdef _MSC_VER`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, CoinStatsHashType hash_t`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// The legacy hash serializes the hashBlock`
`115`		`-static void PrepareHash(CHashWriter& ss, CCoinsStats& stats)`
	`115`	`+static void PrepareHash(CHashWriter& ss, const CCoinsStats& stats)`
`116`	`116`	`{`
`117`	`117`	`ss << stats.hashBlock;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ void SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore,`
`286`	`286`	`SignTransactionResultToJSON(mtx, complete, coins, input_errors, result);`
`287`	`287`	`}`
`288`	`288`
`289`		`-void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, std::map<int, std::string>& input_errors, UniValue& result)`
	`289`	`+void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, const std::map<int, std::string>& input_errors, UniValue& result)`
`290`	`290`	`{`
`291`	`291`	`// Make errors UniValue`
`292`	`292`	`UniValue vErrors(UniValue::VARR);`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class CSignatureCache`
`66`	`66`	`return setValid.contains(entry, erase);`
`67`	`67`	`}`
`68`	`68`
`69`		`- void Set(uint256& entry)`
	`69`	`+ void Set(const uint256& entry)`
`70`	`70`	`{`
`71`	`71`	`boost::unique_lock<boost::shared_mutex> lock(cs_sigcache);`
`72`	`72`	`setValid.insert(entry);`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ class CAddrManTest : public CAddrMan`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`// Simulates connection failure so that we can test eviction of offline nodes`
`74`		`- void SimConnFail(CService& addr)`
	`74`	`+ void SimConnFail(const CService& addr)`
`75`	`75`	`{`
`76`	`76`	`LOCK(cs);`
`77`	`77`	`int64_t nLastSuccess = 1;`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class CAddrManCorrupted : public CAddrManSerializationMock`
`75`	`75`	`}`
`76`	`76`	`};`
`77`	`77`
`78`		`-static CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman)`
	`78`	`+static CDataStream AddrmanToStream(const CAddrManSerializationMock& _addrman)`
`79`	`79`	`{`
`80`	`80`	`CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);`
`81`	`81`	`ssPeersIn << Params().MessageStart();`
Original file line number	Diff line number	Diff line change
`@@ -1860,7 +1860,7 @@ BOOST_AUTO_TEST_CASE(test_Capitalize)`
`1860`	`1860`	`BOOST_CHECK_EQUAL(Capitalize("\x00\xfe\xff"), "\x00\xfe\xff");`
`1861`	`1861`	`}`
`1862`	`1862`
`1863`		`-static std::string SpanToStr(Span<const char>& span)`
	`1863`	`+static std::string SpanToStr(const Span<const char>& span)`
`1864`	`1864`	`{`
`1865`	`1865`	`return std::string(span.begin(), span.end());`
`1866`	`1866`	`}`