Skip to content

Commit

Permalink
[Branding] bitcoin -> navcoin
Browse files Browse the repository at this point in the history
  • Loading branch information
mxaddict committed Feb 16, 2024
1 parent 82729c5 commit d04cb4f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions test/functional/feature_config_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,14 @@ def test_config_file_log(self):
self.log.info('Test that correct configuration path is changed when configuration file changes the datadir')

# Create a temporary directory that will be treated as the default data
# directory by bitcoind.
# directory by navcoind.
env, default_datadir = util.get_temp_default_datadir(Path(self.options.tmpdir, "test_config_file_log"))
default_datadir.mkdir(parents=True)

# Write a navcoin.conf file in the default data directory containing a
# datadir= line pointing at the node datadir.
node = self.nodes[0]
conf_text = node.bitcoinconf.read_text()
conf_text = node.navcoinconf.read_text()
conf_path = default_datadir / "navcoin.conf"
conf_path.write_text(f"datadir={node.datadir_path}\n{conf_text}")

Expand All @@ -140,7 +140,7 @@ def test_config_file_log(self):
node.args = [arg for arg in node.args if not arg.startswith("-datadir=")]

# Check that correct configuration file path is actually logged
# (conf_path, not node.bitcoinconf)
# (conf_path, not node.navcoinconf)
with self.nodes[0].assert_debug_log(expected_msgs=[f"Config file: {conf_path}"]):
self.start_node(0, ["-allowignoredconf"], env=env)
self.stop_node(0)
Expand Down Expand Up @@ -346,7 +346,7 @@ def test_ignored_default_conf(self):
'and it contains a different navcoin.conf file that would be ignored')

# Create a temporary directory that will be treated as the default data
# directory by bitcoind.
# directory by navcoind.
env, default_datadir = util.get_temp_default_datadir(Path(self.options.tmpdir, "home"))
default_datadir.mkdir(parents=True)

Expand Down
6 changes: 3 additions & 3 deletions test/functional/test_framework/test_node.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __init__(self, i, datadir_path, *, chain, rpchost, timewait, timeout_factor,
self.index = i
self.p2p_conn_index = 1
self.datadir_path = datadir_path
self.bitcoinconf = self.datadir_path / "navcoin.conf"
self.navcoinconf = self.datadir_path / "navcoin.conf"
self.stdout_dir = self.datadir_path / "stdout"
self.stderr_dir = self.datadir_path / "stderr"
self.chain = chain
Expand Down Expand Up @@ -423,13 +423,13 @@ def replace_in_config(self, replacements):
The substitutions are passed as a list of search-replace-tuples, e.g.
[("old", "new"), ("foo", "bar"), ...]
"""
with open(self.bitcoinconf, 'r', encoding='utf8') as conf:
with open(self.navcoinconf, 'r', encoding='utf8') as conf:
conf_data = conf.read()
for replacement in replacements:
assert_equal(len(replacement), 2)
old, new = replacement[0], replacement[1]
conf_data = conf_data.replace(old, new)
with open(self.bitcoinconf, 'w', encoding='utf8') as conf:
with open(self.navcoinconf, 'w', encoding='utf8') as conf:
conf.write(conf_data)

@property
Expand Down

0 comments on commit d04cb4f

Please sign in to comment.