Skip to content

Commit

Permalink
trivial: Replace bitcoind with blackmored
Browse files Browse the repository at this point in the history
  • Loading branch information
lateminer committed Feb 16, 2025
1 parent 880664e commit ae35596
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/rpc/external_signer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static RPCHelpMan enumeratesigners()
[&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue
{
const std::string command = gArgs.GetArg("-signer", "");
if (command == "") throw JSONRPCError(RPC_MISC_ERROR, "Error: restart bitcoind with -signer=<cmd>");
if (command == "") throw JSONRPCError(RPC_MISC_ERROR, "Error: restart blackmored with -signer=<cmd>");
const std::string chain = gArgs.GetChainTypeString();
UniValue signers_res = UniValue::VARR;
try {
Expand Down
2 changes: 1 addition & 1 deletion src/txdb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bool CCoinsViewDB::BatchWrite(CCoinsMap &mapCoins, const uint256 &hashBlock, boo
std::vector<uint256> old_heads = GetHeadBlocks();
if (old_heads.size() == 2) {
if (old_heads[0] != hashBlock) {
LogPrintLevel(BCLog::COINDB, BCLog::Level::Error, "The coins database detected an inconsistent state, likely due to a previous crash or shutdown. You will need to restart bitcoind with the -reindex-chainstate or -reindex configuration option.\n");
LogPrintLevel(BCLog::COINDB, BCLog::Level::Error, "The coins database detected an inconsistent state, likely due to a previous crash or shutdown. You will need to restart blackmored with the -reindex-chainstate or -reindex configuration option.\n");
}
assert(old_heads[0] == hashBlock);
old_tip = old_heads[1];
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/external_signer_scriptpubkeyman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ bool ExternalSignerScriptPubKeyMan::SetupDescriptor(std::unique_ptr<Descriptor>

ExternalSigner ExternalSignerScriptPubKeyMan::GetExternalSigner() {
const std::string command = gArgs.GetArg("-signer", "");
if (command == "") throw std::runtime_error(std::string(__func__) + ": restart bitcoind with -signer=<cmd>");
if (command == "") throw std::runtime_error(std::string(__func__) + ": restart blackmored with -signer=<cmd>");
std::vector<ExternalSigner> signers;
ExternalSigner::Enumerate(command, signers, Params().GetChainTypeString());
if (signers.empty()) throw std::runtime_error(std::string(__func__) + ": No external signers found");
Expand Down
2 changes: 1 addition & 1 deletion src/wallet/wallet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3152,7 +3152,7 @@ bool CWallet::AttachChain(const std::shared_ptr<CWallet>& walletInstance, interf
// Wallet is assumed to be from another chain, if genesis block in the active
// chain differs from the genesis block known to the wallet.
if (chain.getBlockHash(0) != locator.vHave.back()) {
error = Untranslated("Wallet files should not be reused across chains. Restart bitcoind with -walletcrosschain to override.");
error = Untranslated("Wallet files should not be reused across chains. Restart blackmored with -walletcrosschain to override.");
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/functional/rpc_signer.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def clear_mock_result(self, node):
def run_test(self):
self.log.debug(f"-signer={self.mock_signer_path()}")

assert_raises_rpc_error(-1, 'Error: restart bitcoind with -signer=<cmd>',
assert_raises_rpc_error(-1, 'Error: restart blackmored with -signer=<cmd>',
self.nodes[0].enumeratesigners
)

Expand Down

0 comments on commit ae35596

Please sign in to comment.