foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-08 10:31:50 -05:00
Code Issues Activity

Merge 6d300e84d4 into 85f96b01b7

Browse source
This commit is contained in:
Benjamin Woosley 2025-01-31 21:50:15 +01:00 • committed by GitHub
commit 5d67becb62
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/init.cpp
View file

@ -34,9 +34,9 @@ std::optional<ConfigError> InitConfig(ArgsManager& args, SettingsAbortFn setting
const fs::path orig_datadir_path{args.GetDataDirBase()};
const fs::path orig_config_path{AbsPathForConfigVal(args, args.GetPathArg("-conf", BITCOIN_CONF_FILENAME), /*net_specific=*/false)};
std::string error;
if (!args.ReadConfigFiles(error, true)) {
return ConfigError{ConfigStatus::FAILED, strprintf(_("Error reading configuration file: %s"), error)};
std::string config_error;
if (!args.ReadConfigFiles(config_error, true)) {
return ConfigError{ConfigStatus::FAILED, strprintf(_("Error reading configuration file: %s"), config_error)};
}
// Check for chain settings (Params() calls are only valid after this clause)

2
src/net_processing.cpp
View file

@ -3069,8 +3069,6 @@ bool PeerManagerImpl::ProcessOrphanTx(Peer& peer)
AssertLockHeld(g_msgproc_mutex);
LOCK2(::cs_main, m_tx_download_mutex);
CTransactionRef porphanTx = nullptr;
while (CTransactionRef porphanTx = m_txdownloadman.GetTxToReconsider(peer.m_id)) {
const MempoolAcceptResult result = m_chainman.ProcessTransaction(porphanTx);
const TxValidationState& state = result.m_state;

6
src/test/key_tests.cpp
View file

@ -166,8 +166,7 @@ BOOST_AUTO_TEST_CASE(key_signature_tests)
{
// When entropy is specified, we should see at least one high R signature within 20 signatures
CKey key = DecodeSecret(strSecret1);
std::string msg = "A message to be signed";
uint256 msg_hash = Hash(msg);
uint256 msg_hash = Hash("A message to be signed");
std::vector<unsigned char> sig;
bool found = false;
@ -189,8 +188,7 @@ BOOST_AUTO_TEST_CASE(key_signature_tests)
bool bad_sign = false;
for (int i = 0; i < 256; ++i) {
sig.clear();
std::string msg = "A message to be signed" + ToString(i);
msg_hash = Hash(msg);
msg_hash = Hash("A message to be signed" + ToString(i));
if (!key.Sign(msg_hash, sig)) {
bad_sign = true;
break;

1
src/wallet/wallet.cpp
View file

@ -919,7 +919,6 @@ DBErrors CWallet::ReorderTransactions()
// Probably a bad idea to change the output of this
// First: get all CWalletTx into a sorted-by-time multimap.
typedef std::multimap<int64_t, CWalletTx*> TxItems;
TxItems txByTime;
for (auto& entry : mapWallet)