File tree 4 files changed +25
-17
lines changed
4 files changed +25
-17
lines changed Original file line number Diff line number Diff line change 1
- // Copyright (c) 2019-2022 The Bitcoin Core developers
1
+ // Copyright (c) 2019-present The Bitcoin Core developers
2
2
// Distributed under the MIT software license, see the accompanying
3
3
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4
4
5
- #include < string >
5
+ #include < limits >
6
6
#include < vector>
7
- #include < script/script.h>
8
- #include < script/miniscript.h>
9
- #include < serialize.h>
10
7
11
- #include < assert.h>
8
+ #include < primitives/transaction.h>
9
+ #include < script/miniscript.h>
10
+ #include < script/script.h>
11
+ #include < script/solver.h>
12
+ #include < span.h>
13
+ #include < util/check.h>
14
+ #include < util/vector.h>
12
15
13
16
namespace miniscript {
14
17
namespace internal {
Original file line number Diff line number Diff line change 1
- // Copyright (c) 2019-2022 The Bitcoin Core developers
1
+ // Copyright (c) 2019-present The Bitcoin Core developers
2
2
// Distributed under the MIT software license, see the accompanying
3
3
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4
4
5
5
#ifndef BITCOIN_SCRIPT_MINISCRIPT_H
6
6
#define BITCOIN_SCRIPT_MINISCRIPT_H
7
7
8
8
#include < algorithm>
9
- #include < functional>
10
- #include < numeric>
9
+ #include < compare>
10
+ #include < cstdint>
11
+ #include < cstdlib>
12
+ #include < iterator>
11
13
#include < memory>
12
14
#include < optional>
13
- #include < string>
15
+ #include < set>
16
+ #include < stdexcept>
17
+ #include < tuple>
18
+ #include < utility>
14
19
#include < vector>
15
20
16
- #include < assert.h>
17
- #include < cstdlib>
18
-
21
+ #include < consensus/consensus.h>
19
22
#include < policy/policy.h>
20
- #include < primitives/transaction .h>
23
+ #include < script/interpreter .h>
21
24
#include < script/parsing.h>
22
25
#include < script/script.h>
26
+ #include < serialize.h>
23
27
#include < span.h>
24
28
#include < util/check.h>
25
29
#include < util/strencodings.h>
@@ -150,7 +154,8 @@ class Type {
150
154
};
151
155
152
156
// ! Literal operator to construct Type objects.
153
- inline consteval Type operator " " _mst(const char * c, size_t l) {
157
+ inline consteval Type operator " " _mst(const char * c, size_t l)
158
+ {
154
159
Type typ{Type::Make (0 )};
155
160
156
161
for (const char *p = c; p < c + l; p++) {
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ using NodeRef = miniscript::NodeRef<CPubKey>;
22
22
using Node = miniscript::Node<CPubKey>;
23
23
using Type = miniscript::Type;
24
24
using MsCtx = miniscript::MiniscriptContext;
25
- using miniscript::operator " " _mst;
25
+ using miniscript::operator " " _mst;
26
26
27
27
// ! Some pre-computed data for more efficient string roundtrips and to simulate challenges.
28
28
struct TestData {
Original file line number Diff line number Diff line change @@ -293,7 +293,7 @@ class TestSignatureChecker : public BaseSignatureChecker {
293
293
294
294
using Fragment = miniscript::Fragment;
295
295
using NodeRef = miniscript::NodeRef<CPubKey>;
296
- using miniscript::operator " " _mst;
296
+ using miniscript::operator " " _mst;
297
297
using Node = miniscript::Node<CPubKey>;
298
298
299
299
/* * Compute all challenges (pubkeys, hashes, timelocks) that occur in a given Miniscript. */
You can’t perform that action at this time.
0 commit comments