diff options
author | Andrew Chow <github@achow101.com> | 2023-08-09 07:36:08 -0400 |
---|---|---|
committer | Andrew Chow <github@achow101.com> | 2023-08-14 17:39:49 -0400 |
commit | 91d924ede1b421df31c895f4f43359e453a09ca5 (patch) | |
tree | 823f62a894ec3839da6491cbcd0a2cacf9b02522 /src/script | |
parent | bacdb2e208531124e85ed2d4ea2a4b508fbb5088 (diff) |
Rename script/standard.{cpp/h} to script/solver.{cpp/h}
Since script/standard only contains things that are used by the Solver
and its callers, rename the files to script/solver.
Diffstat (limited to 'src/script')
-rw-r--r-- | src/script/descriptor.cpp | 2 | ||||
-rw-r--r-- | src/script/sign.cpp | 2 | ||||
-rw-r--r-- | src/script/solver.cpp (renamed from src/script/standard.cpp) | 2 | ||||
-rw-r--r-- | src/script/solver.h (renamed from src/script/standard.h) | 8 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/script/descriptor.cpp b/src/script/descriptor.cpp index 3d8497ef19..436ea9c093 100644 --- a/src/script/descriptor.cpp +++ b/src/script/descriptor.cpp @@ -10,7 +10,7 @@ #include <script/miniscript.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <uint256.h> #include <common/args.h> diff --git a/src/script/sign.cpp b/src/script/sign.cpp index c28773ed0e..92b7ad50b5 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -13,7 +13,7 @@ #include <script/miniscript.h> #include <script/script.h> #include <script/signingprovider.h> -#include <script/standard.h> +#include <script/solver.h> #include <uint256.h> #include <util/translation.h> #include <util/vector.h> diff --git a/src/script/standard.cpp b/src/script/solver.cpp index 40ae381f0f..1cd388b061 100644 --- a/src/script/standard.cpp +++ b/src/script/solver.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include <script/standard.h> +#include <script/solver.h> #include <pubkey.h> #include <script/interpreter.h> #include <script/script.h> diff --git a/src/script/standard.h b/src/script/solver.h index 2b743776b4..dc8f4c357d 100644 --- a/src/script/standard.h +++ b/src/script/solver.h @@ -3,8 +3,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef BITCOIN_SCRIPT_STANDARD_H -#define BITCOIN_SCRIPT_STANDARD_H +// The Solver functions are used by policy and the wallet, but not consensus. + +#ifndef BITCOIN_SCRIPT_SOLVER_H +#define BITCOIN_SCRIPT_SOLVER_H #include <attributes.h> #include <script/script.h> @@ -61,4 +63,4 @@ std::optional<std::pair<int, std::vector<Span<const unsigned char>>>> MatchMulti /** Generate a multisig script. */ CScript GetScriptForMultisig(int nRequired, const std::vector<CPubKey>& keys); -#endif // BITCOIN_SCRIPT_STANDARD_H +#endif // BITCOIN_SCRIPT_SOLVER_H |