GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-17 13:07:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d4d9daff7a into merged_master (Bitcoin PR bitcoin/bitcoin#25200)

Browse source
This commit is contained in:
James Dorfman 2024-09-06 18:34:56 +00:00
commit 49b32361ba
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/bench/bench.cpp
View file

@ -58,7 +58,7 @@ void benchmark::BenchRunner::RunAll(const Args& args)
std::smatch baseMatch;
if (args.sanity_check) {
std::cout << "Running with --sanity check option, benchmark results will be useless." << std::endl;
std::cout << "Running with --sanity-check option, benchmark results will be useless." << std::endl;
}
std::vector<ankerl::nanobench::Result> benchmarkResults;

4
src/qt/test/addressbooktests.cpp
View file

@ -182,13 +182,13 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
search_line->setText("io");
QCOMPARE(table_view->model()->rowCount(), 2);
// Check wilcard "?".
// Check wildcard "?".
search_line->setText("io?new");
QCOMPARE(table_view->model()->rowCount(), 0);
search_line->setText("io???new");
QCOMPARE(table_view->model()->rowCount(), 2);
// Check wilcard "*".
// Check wildcard "*".
search_line->setText("io*new");
QCOMPARE(table_view->model()->rowCount(), 2);
search_line->setText("*");

2
src/test/versionbits_tests.cpp
View file

@ -257,7 +257,7 @@ BOOST_AUTO_TEST_CASE(versionbits_test)
/** Check that ComputeBlockVersion will set the appropriate bit correctly */
static void check_computeblockversion(VersionBitsCache& versionbitscache, const Consensus::Params& params, Consensus::DeploymentPos dep)
{
// Clear the cache everytime
// Clear the cache every time
versionbitscache.Clear();
int64_t bit = params.vDeployments[dep].bit;

4
src/util/time.h
View file

@ -86,8 +86,8 @@ void SetMockTime(std::chrono::seconds mock_time_in);
std::chrono::seconds GetMockTime();
/**
* Return the current time point cast to the given precicion. Only use this
* when an exact precicion is needed, otherwise use T::clock::now() directly.
* Return the current time point cast to the given precision. Only use this
* when an exact precision is needed, otherwise use T::clock::now() directly.
*/
template <typename T>
T Now()

1
test/lint/spelling.ignore-words.txt Normal file → Executable file
View file

@ -16,6 +16,7 @@ inflight
keypair
mor
mut
nd
nin
ser
siz