Skip to content

Commit 3047c3e

Browse files
committed
addrman: drop /*deterministic=*/ comment
Just having deterministic is enough. See bitcoin/bitcoin#29007 (comment)
1 parent 89b84ea commit 3047c3e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/addrdb.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
195195
auto check_addrman = std::clamp<int32_t>(args.GetIntArg("-checkaddrman", DEFAULT_ADDRMAN_CONSISTENCY_CHECKS), 0, 1000000);
196196
bool deterministic = HasTestOption(args, "addrman"); // use a deterministic addrman only for tests
197197

198-
auto addrman{std::make_unique<AddrMan>(netgroupman, /*deterministic=*/deterministic, /*consistency_check_ratio=*/check_addrman)};
198+
auto addrman{std::make_unique<AddrMan>(netgroupman, deterministic, /*consistency_check_ratio=*/check_addrman)};
199199

200200
const auto start{SteadyClock::now()};
201201
const auto path_addr{args.GetDataDirNet() / "peers.dat"};
@@ -204,15 +204,15 @@ util::Result<std::unique_ptr<AddrMan>> LoadAddrman(const NetGroupManager& netgro
204204
LogPrintf("Loaded %i addresses from peers.dat %dms\n", addrman->Size(), Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
205205
} catch (const DbNotFoundError&) {
206206
// Addrman can be in an inconsistent state after failure, reset it
207-
addrman = std::make_unique<AddrMan>(netgroupman, /*deterministic=*/deterministic, /*consistency_check_ratio=*/check_addrman);
207+
addrman = std::make_unique<AddrMan>(netgroupman, deterministic, /*consistency_check_ratio=*/check_addrman);
208208
LogPrintf("Creating peers.dat because the file was not found (%s)\n", fs::quoted(fs::PathToString(path_addr)));
209209
DumpPeerAddresses(args, *addrman);
210210
} catch (const InvalidAddrManVersionError&) {
211211
if (!RenameOver(path_addr, (fs::path)path_addr + ".bak")) {
212212
return util::Error{strprintf(_("Failed to rename invalid peers.dat file. Please move or delete it and try again."))};
213213
}
214214
// Addrman can be in an inconsistent state after failure, reset it
215-
addrman = std::make_unique<AddrMan>(netgroupman, /*deterministic=*/deterministic, /*consistency_check_ratio=*/check_addrman);
215+
addrman = std::make_unique<AddrMan>(netgroupman, deterministic, /*consistency_check_ratio=*/check_addrman);
216216
LogPrintf("Creating new peers.dat because the file version was not compatible (%s). Original backed up to peers.dat.bak\n", fs::quoted(fs::PathToString(path_addr)));
217217
DumpPeerAddresses(args, *addrman);
218218
} catch (const std::exception& e) {

0 commit comments

Comments
 (0)