From d3345c9ee4cb0445f62ec1f13cf4ae389f3b7ee8 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 16 Oct 2024 13:16:00 +0300 Subject: [PATCH 1/2] fix: adjust the number of spork defaults 6275 follow-up --- src/spork.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/spork.h b/src/spork.h index e8d5d81d71..a9ed23424c 100644 --- a/src/spork.h +++ b/src/spork.h @@ -68,7 +68,7 @@ struct CSporkDef }; #define MAKE_SPORK_DEF(name, defaultValue) CSporkDef{name, defaultValue, #name} -[[maybe_unused]] static constexpr std::array sporkDefs = { +[[maybe_unused]] static constexpr std::array sporkDefs = { MAKE_SPORK_DEF(SPORK_2_INSTANTSEND_ENABLED, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_3_INSTANTSEND_BLOCK_FILTERING, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_9_SUPERBLOCKS_ENABLED, 4070908800ULL), // OFF From 7d933d876d76cfd490b353fb5c57ba5a62be685e Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 16 Oct 2024 13:30:51 +0300 Subject: [PATCH 2/2] test: should have no spork with an empty name --- test/functional/feature_sporks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/functional/feature_sporks.py b/test/functional/feature_sporks.py index 46e96c81e5..b6b5fdf7b8 100755 --- a/test/functional/feature_sporks.py +++ b/test/functional/feature_sporks.py @@ -59,5 +59,8 @@ class SporkTest(BitcoinTestFramework): self.connect_nodes(1, 2) self.wait_until(lambda: self.get_test_spork_state(self.nodes[2]), timeout=10) + assert "" not in self.nodes[0].spork('show').keys() + + if __name__ == '__main__': SporkTest().main()