Skip to content
Bitcoin Roots

v29.4-roots.2 · Commit 7: [PATCH 07/21] release: establish Roots maintenance and assurance

src/test/script_p2sh_tests.cpp

Before: src/test/script_p2sh_tests.cpp · After: src/test/script_p2sh_tests.cpp

File metadata
index 2ac22d79efa121fafe888dadc9f27f107b945177..9f9bf08d372c5d6a615c3a25f4ba4327d3af60d9 100644

Download original patch · Release notes

Diff rows 1–23 of 23. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/test/script_p2sh_tests.cpp CHANGED
@@ -3,7 +3,6 @@
3
  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
4
 
5
  #include <consensus/tx_verify.h>
6
- #include <kernel/mempool_options.h>
7
  #include <key.h>
8
  #include <policy/policy.h>
9
  #include <policy/settings.h>
@@ -22,7 +21,7 @@
22
  // Helpers:
23
  static bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, std::string& reason)
24
  {
25
- const kernel::MemPoolOptions opts{
26
  .permit_bare_pubkey = true,
27
  .permit_bare_multisig = permit_bare_multisig,
28
  };
@@ -31,7 +30,7 @@ static bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, std:
31
 
32
  static bool IsStandardTx(const CTransaction& tx, std::string& reason)
33
  {
34
- kernel::MemPoolOptions opts{
35
  .permit_bare_pubkey = true,
36
  .permit_bare_multisig = true,
37
  };
 
3
  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
4
 
5
  #include <consensus/tx_verify.h>
 
6
  #include <key.h>
7
  #include <policy/policy.h>
8
  #include <policy/settings.h>
 
21
  // Helpers:
22
  static bool IsStandardTx(const CTransaction& tx, bool permit_bare_multisig, std::string& reason)
23
  {
24
+ const StandardnessOptions opts{
25
  .permit_bare_pubkey = true,
26
  .permit_bare_multisig = permit_bare_multisig,
27
  };
 
30
 
31
  static bool IsStandardTx(const CTransaction& tx, std::string& reason)
32
  {
33
+ StandardnessOptions opts{
34
  .permit_bare_pubkey = true,
35
  .permit_bare_multisig = true,
36
  };