Skip to content

Commit

Permalink
Merge #6331: fix: adjust the number of spork defaults
Browse files Browse the repository at this point in the history
7d933d8 test: should have no spork with an empty name (UdjinM6)
d3345c9 fix: adjust the number of spork defaults (UdjinM6)

Pull request description:

  ## Issue being fixed or feature implemented
  ```
  {
    "SPORK_2_INSTANTSEND_ENABLED": 4070908800,
    "SPORK_3_INSTANTSEND_BLOCK_FILTERING": 4070908800,
    "SPORK_9_SUPERBLOCKS_ENABLED": 4070908800,
    "SPORK_17_QUORUM_DKG_ENABLED": 4070908800,
    "SPORK_19_CHAINLOCKS_ENABLED": 4070908800,
    "SPORK_21_QUORUM_ALL_CONNECTED": 4070908800,
    "SPORK_23_QUORUM_POSE": 4070908800,
    "": 0 <----- this line shouldn't exist
  }
  ```

  6275 follow-up

  ## What was done?

  ## How Has This Been Tested?

  ## Breaking Changes

  ## Checklist:
  - [ ] I have performed a self-review of my own code
  - [ ] I have commented my code, particularly in hard-to-understand areas
  - [ ] I have added or updated relevant unit/integration/functional/e2e tests
  - [ ] I have made corresponding changes to the documentation
  - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_

ACKs for top commit:
  knst:
    utACK 7d933d8
  PastaPastaPasta:
    utACK 7d933d8

Tree-SHA512: bacdbf95bff2c3aec6b5767caa06d2850a7ed554231160a914e12b9c4aa8d14237b98bef22739440feec616bd525fa4fb7dcfc2185e206d73f1ac3c6f2988b88
  • Loading branch information
PastaPastaPasta committed Oct 22, 2024
2 parents dd629cf + 7d933d8 commit dd33182
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/spork.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct CSporkDef
};

#define MAKE_SPORK_DEF(name, defaultValue) CSporkDef{name, defaultValue, #name}
[[maybe_unused]] static constexpr std::array<CSporkDef, 8> sporkDefs = {
[[maybe_unused]] static constexpr std::array<CSporkDef, 7> 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
Expand Down
3 changes: 3 additions & 0 deletions test/functional/feature_sporks.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,8 @@ def run_test(self):
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()

0 comments on commit dd33182

Please sign in to comment.