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

kwvg · kwvg · commit 40c270030ed2 · 2022-10-17T08:03:12.000+05:30
diff --git a/src/init.cpp b/src/init.cpp
@@ -1214,7 +1214,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/interfaces/wallet.cpp b/src/interfaces/wallet.cpp
@@ -75,7 +75,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 = wallet.chain().getBlockHeight(wtx.m_confirm.hashBlock).value_or(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)
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
@@ -145,7 +145,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
@@ -205,7 +205,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
@@ -56,7 +56,7 @@ class CSignatureCache
         return setValid.contains(entry, erase);
     }
 
-    void Set(uint256& entry)
+    void Set(const uint256& entry)
     {
         std::unique_lock<std::shared_mutex> lock(cs_sigcache);
         setValid.insert(entry);
diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp
@@ -69,7 +69,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
@@ -70,7 +70,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
@@ -1802,7 +1802,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());
 }

Original file line number	Diff line number	Diff line change
`@@ -1214,7 +1214,7 @@ std::set<BlockFilterType> g_enabled_filter_types;`
`1214`	`1214`	`std::terminate();`
`1215`	`1215`	`};`
`1216`	`1216`
`1217`		`-bool AppInitBasicSetup(ArgsManager& args)`
	`1217`	`+bool AppInitBasicSetup(const ArgsManager& args)`
`1218`	`1218`	`{`
`1219`	`1219`	`// ********************************************************* Step 1: setup`
`1220`	`1220`	`#ifdef _MSC_VER`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ WalletTx MakeWalletTx(CWallet& wallet, const CWalletTx& wtx)`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`//! Construct wallet tx status struct.`
`78`		`-WalletTxStatus MakeWalletTxStatus(CWallet& wallet, const CWalletTx& wtx)`
	`78`	`+WalletTxStatus MakeWalletTxStatus(const CWallet& wallet, const CWalletTx& wtx)`
`79`	`79`	`{`
`80`	`80`	`WalletTxStatus result;`
`81`	`81`	`result.block_height = wallet.chain().getBlockHeight(wtx.m_confirm.hashBlock).value_or(std::numeric_limits<int>::max());`
`@@ -94,7 +94,7 @@ WalletTxStatus MakeWalletTxStatus(CWallet& wallet, const CWalletTx& wtx)`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`//! Construct wallet TxOut struct.`
`97`		`-WalletTxOut MakeWalletTxOut(CWallet& wallet,`
	`97`	`+WalletTxOut MakeWalletTxOut(const CWallet& wallet,`
`98`	`98`	`const CWalletTx& wtx,`
`99`	`99`	`int n,`
`100`	`100`	`int depth) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet)`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, CoinStatsHashType hash_t`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`// The legacy hash serializes the hashBlock`
`148`		`-static void PrepareHash(CHashWriter& ss, CCoinsStats& stats)`
	`148`	`+static void PrepareHash(CHashWriter& ss, const CCoinsStats& stats)`
`149`	`149`	`{`
`150`	`150`	`ss << stats.hashBlock;`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ void SignTransaction(CMutableTransaction& mtx, const SigningProvider* keystore,`
`205`	`205`	`SignTransactionResultToJSON(mtx, complete, coins, input_errors, result);`
`206`	`206`	`}`
`207`	`207`
`208`		`-void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, std::map<int, std::string>& input_errors, UniValue& result)`
	`208`	`+void SignTransactionResultToJSON(CMutableTransaction& mtx, bool complete, const std::map<COutPoint, Coin>& coins, const std::map<int, std::string>& input_errors, UniValue& result)`
`209`	`209`	`{`
`210`	`210`	`// Make errors UniValue`
`211`	`211`	`UniValue vErrors(UniValue::VARR);`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ class CSignatureCache`
`56`	`56`	`return setValid.contains(entry, erase);`
`57`	`57`	`}`
`58`	`58`
`59`		`- void Set(uint256& entry)`
	`59`	`+ void Set(const uint256& entry)`
`60`	`60`	`{`
`61`	`61`	`std::unique_lock<std::shared_mutex> lock(cs_sigcache);`
`62`	`62`	`setValid.insert(entry);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class CAddrManTest : public CAddrMan`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// Simulates connection failure so that we can test eviction of offline nodes`
`72`		`- void SimConnFail(CService& addr)`
	`72`	`+ void SimConnFail(const CService& addr)`
`73`	`73`	`{`
`74`	`74`	`LOCK(cs);`
`75`	`75`	`int64_t nLastSuccess = 1;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ class CAddrManCorrupted : public CAddrManSerializationMock`
`70`	`70`	`}`
`71`	`71`	`};`
`72`	`72`
`73`		`-static CDataStream AddrmanToStream(CAddrManSerializationMock& _addrman)`
	`73`	`+static CDataStream AddrmanToStream(const CAddrManSerializationMock& _addrman)`
`74`	`74`	`{`
`75`	`75`	`CDataStream ssPeersIn(SER_DISK, CLIENT_VERSION);`
`76`	`76`	`ssPeersIn << Params().MessageStart();`
Original file line number	Diff line number	Diff line change
`@@ -1802,7 +1802,7 @@ BOOST_AUTO_TEST_CASE(test_Capitalize)`
`1802`	`1802`	`BOOST_CHECK_EQUAL(Capitalize("\x00\xfe\xff"), "\x00\xfe\xff");`
`1803`	`1803`	`}`
`1804`	`1804`
`1805`		`-static std::string SpanToStr(Span<const char>& span)`
	`1805`	`+static std::string SpanToStr(const Span<const char>& span)`
`1806`	`1806`	`{`
`1807`	`1807`	`return std::string(span.begin(), span.end());`
`1808`	`1808`	`}`