mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-05-04 19:08:51 +02:00
scripted-diff: Rename PACKAGE_* variables to CLIENT_*
This change ensures consistent use of the `CLIENT_` namespace everywhere
in the repository.
-BEGIN VERIFY SCRIPT-
ren() { sed -i "s/\<$1\>/$2/g" $( git grep -l "$1" ./cmake ./src :\(exclude\)./src/secp256k1 ./test ) ; }
ren PACKAGE_NAME CLIENT_NAME
ren PACKAGE_VERSION CLIENT_VERSION_STRING
ren PACKAGE_URL CLIENT_URL
ren PACKAGE_BUGREPORT CLIENT_BUGREPORT
-END VERIFY SCRIPT-
This commit is contained in:
@@ -6,8 +6,8 @@
|
||||
# test/*/test_runner.py and test/util/rpcauth-test.py
|
||||
|
||||
[environment]
|
||||
PACKAGE_NAME=@CLIENT_NAME@
|
||||
PACKAGE_BUGREPORT=@CLIENT_BUGREPORT@
|
||||
CLIENT_NAME=@CLIENT_NAME@
|
||||
CLIENT_BUGREPORT=@CLIENT_BUGREPORT@
|
||||
SRCDIR=@abs_top_srcdir@
|
||||
BUILDDIR=@abs_top_builddir@
|
||||
EXEEXT=@EXEEXT@
|
||||
|
||||
@@ -54,7 +54,7 @@ class AddrmanTest(BitcoinTestFramework):
|
||||
peers_dat = os.path.join(self.nodes[0].chain_path, "peers.dat")
|
||||
init_error = lambda reason: (
|
||||
f"Error: Invalid or corrupt peers.dat \\({reason}\\). If you believe this "
|
||||
f"is a bug, please report it to {self.config['environment']['PACKAGE_BUGREPORT']}. "
|
||||
f"is a bug, please report it to {self.config['environment']['CLIENT_BUGREPORT']}. "
|
||||
f'As a workaround, you can move the file \\("{re.escape(peers_dat)}"\\) out of the way \\(rename, '
|
||||
"move, or delete\\) to have a new one created on the next start."
|
||||
)
|
||||
|
||||
@@ -30,7 +30,7 @@ class FilelockTest(BitcoinTestFramework):
|
||||
self.log.info(f"Using datadir {datadir}")
|
||||
|
||||
self.log.info("Check that we can't start a second bitcoind instance using the same datadir")
|
||||
expected_msg = f"Error: Cannot obtain a lock on data directory {datadir}. {self.config['environment']['PACKAGE_NAME']} is probably already running."
|
||||
expected_msg = f"Error: Cannot obtain a lock on data directory {datadir}. {self.config['environment']['CLIENT_NAME']} is probably already running."
|
||||
self.nodes[1].assert_start_raises_init_error(extra_args=[f'-datadir={self.nodes[0].datadir_path}', '-noserver'], expected_msg=expected_msg)
|
||||
|
||||
self.log.info("Check that cookie and PID file are not deleted when attempting to start a second bitcoind using the same datadir")
|
||||
@@ -46,7 +46,7 @@ class FilelockTest(BitcoinTestFramework):
|
||||
wallet_dir = self.nodes[0].wallets_path
|
||||
self.log.info("Check that we can't start a second bitcoind instance using the same wallet")
|
||||
if descriptors:
|
||||
expected_msg = f"Error: SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['PACKAGE_NAME']}?"
|
||||
expected_msg = f"Error: SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['CLIENT_NAME']}?"
|
||||
else:
|
||||
expected_msg = "Error: Error initializing wallet database environment"
|
||||
self.nodes[1].assert_start_raises_init_error(extra_args=[f'-walletdir={wallet_dir}', f'-wallet={wallet_name}', '-noserver'], expected_msg=expected_msg, match=ErrorMatch.PARTIAL_REGEX)
|
||||
|
||||
@@ -46,7 +46,7 @@ class SettingsTest(BitcoinTestFramework):
|
||||
|
||||
# Assert default settings file was created
|
||||
self.stop_node(0)
|
||||
default_settings = {"_warning_": f"This file is automatically generated and updated by {self.config['environment']['PACKAGE_NAME']}. Please do not edit this file while the node is running, as any changes might be ignored or overwritten."}
|
||||
default_settings = {"_warning_": f"This file is automatically generated and updated by {self.config['environment']['CLIENT_NAME']}. Please do not edit this file while the node is running, as any changes might be ignored or overwritten."}
|
||||
with settings.open() as fp:
|
||||
assert_equal(json.load(fp), default_settings)
|
||||
|
||||
|
||||
@@ -375,7 +375,7 @@ class TestBitcoinCli(BitcoinTestFramework):
|
||||
self.log.info("Test -version with node stopped")
|
||||
self.stop_node(0)
|
||||
cli_response = self.nodes[0].cli('-version').send_cli()
|
||||
assert f"{self.config['environment']['PACKAGE_NAME']} RPC client version" in cli_response
|
||||
assert f"{self.config['environment']['CLIENT_NAME']} RPC client version" in cli_response
|
||||
|
||||
self.log.info("Test -rpcwait option successfully waits for RPC connection")
|
||||
self.nodes[0].start() # start node without RPC connection
|
||||
|
||||
@@ -349,7 +349,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||
self.log.error("Hint: Call {} '{}' to consolidate all logs".format(os.path.normpath(os.path.dirname(os.path.realpath(__file__)) + "/../combine_logs.py"), self.options.tmpdir))
|
||||
self.log.error("")
|
||||
self.log.error("If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.")
|
||||
self.log.error(self.config['environment']['PACKAGE_BUGREPORT'])
|
||||
self.log.error(self.config['environment']['CLIENT_BUGREPORT'])
|
||||
self.log.error("")
|
||||
exit_code = TEST_EXIT_FAILED
|
||||
# Logging.shutdown will not remove stream- and filehandlers, so we must
|
||||
|
||||
@@ -203,7 +203,7 @@ class ToolWalletTest(BitcoinTestFramework):
|
||||
locked_dir = self.nodes[0].wallets_path
|
||||
error = 'Error initializing wallet database environment "{}"!'.format(locked_dir)
|
||||
if self.options.descriptors:
|
||||
error = f"SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['PACKAGE_NAME']}?"
|
||||
error = f"SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['CLIENT_NAME']}?"
|
||||
self.assert_raises_tool_error(
|
||||
error,
|
||||
'-wallet=' + self.default_wallet_name,
|
||||
|
||||
@@ -204,7 +204,7 @@ class MultiWalletTest(BitcoinTestFramework):
|
||||
self.restart_node(0, ['-nowallet', '-walletdir=' + competing_wallet_dir])
|
||||
self.nodes[0].createwallet(self.default_wallet_name)
|
||||
if self.options.descriptors:
|
||||
exp_stderr = f"Error: SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['PACKAGE_NAME']}?"
|
||||
exp_stderr = f"Error: SQLiteDatabase: Unable to obtain an exclusive lock on the database, is it being used by another instance of {self.config['environment']['CLIENT_NAME']}?"
|
||||
else:
|
||||
exp_stderr = r"Error: Error initializing wallet database environment \"\S+competing_walletdir\S*\"!"
|
||||
self.nodes[1].assert_start_raises_init_error(['-walletdir=' + competing_wallet_dir], exp_stderr, match=ErrorMatch.PARTIAL_REGEX)
|
||||
|
||||
Reference in New Issue
Block a user