refactor: Drop deprecated space in operator""_mst
This commit is contained in:
4 files changed
+25
-17
No files matched your search
@@ -1,14 +1,17 @@
|
|||||||
// Copyright (c) 2019-2022 The Bitcoin Core developers
|
// Copyright (c) 2019-present The Bitcoin Core developers
|
||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#include <string>
|
#include <limits>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <script/script.h>
|
|
||||||
#include <script/miniscript.h>
|
|
||||||
#include <serialize.h>
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <primitives/transaction.h>
|
||||||
|
#include <script/miniscript.h>
|
||||||
|
#include <script/script.h>
|
||||||
|
#include <script/solver.h>
|
||||||
|
#include <span.h>
|
||||||
|
#include <util/check.h>
|
||||||
|
#include <util/vector.h>
|
||||||
|
|
||||||
namespace miniscript {
|
namespace miniscript {
|
||||||
namespace internal {
|
namespace internal {
|
||||||
|
|||||||
+14
-9
@@ -1,4 +1,4 @@
|
|||||||
// Copyright (c) 2019-2022 The Bitcoin Core developers
|
// Copyright (c) 2019-present The Bitcoin Core developers
|
||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
@@ -6,20 +6,24 @@
|
|||||||
#define BITCOIN_SCRIPT_MINISCRIPT_H
|
#define BITCOIN_SCRIPT_MINISCRIPT_H
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <functional>
|
#include <compare>
|
||||||
#include <numeric>
|
#include <cstdint>
|
||||||
|
#include <cstdlib>
|
||||||
|
#include <iterator>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
#include <string>
|
#include <set>
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <tuple>
|
||||||
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <assert.h>
|
#include <consensus/consensus.h>
|
||||||
#include <cstdlib>
|
|
||||||
|
|
||||||
#include <policy/policy.h>
|
#include <policy/policy.h>
|
||||||
#include <primitives/transaction.h>
|
#include <script/interpreter.h>
|
||||||
#include <script/parsing.h>
|
#include <script/parsing.h>
|
||||||
#include <script/script.h>
|
#include <script/script.h>
|
||||||
|
#include <serialize.h>
|
||||||
#include <span.h>
|
#include <span.h>
|
||||||
#include <util/check.h>
|
#include <util/check.h>
|
||||||
#include <util/strencodings.h>
|
#include <util/strencodings.h>
|
||||||
@@ -150,7 +154,8 @@ public:
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! Literal operator to construct Type objects.
|
//! Literal operator to construct Type objects.
|
||||||
inline consteval Type operator"" _mst(const char* c, size_t l) {
|
inline consteval Type operator""_mst(const char* c, size_t l)
|
||||||
|
{
|
||||||
Type typ{Type::Make(0)};
|
Type typ{Type::Make(0)};
|
||||||
|
|
||||||
for (const char *p = c; p < c + l; p++) {
|
for (const char *p = c; p < c + l; p++) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ using NodeRef = miniscript::NodeRef<CPubKey>;
|
|||||||
using Node = miniscript::Node<CPubKey>;
|
using Node = miniscript::Node<CPubKey>;
|
||||||
using Type = miniscript::Type;
|
using Type = miniscript::Type;
|
||||||
using MsCtx = miniscript::MiniscriptContext;
|
using MsCtx = miniscript::MiniscriptContext;
|
||||||
using miniscript::operator"" _mst;
|
using miniscript::operator""_mst;
|
||||||
|
|
||||||
//! Some pre-computed data for more efficient string roundtrips and to simulate challenges.
|
//! Some pre-computed data for more efficient string roundtrips and to simulate challenges.
|
||||||
struct TestData {
|
struct TestData {
|
||||||
|
|||||||
@@ -293,7 +293,7 @@ public:
|
|||||||
|
|
||||||
using Fragment = miniscript::Fragment;
|
using Fragment = miniscript::Fragment;
|
||||||
using NodeRef = miniscript::NodeRef<CPubKey>;
|
using NodeRef = miniscript::NodeRef<CPubKey>;
|
||||||
using miniscript::operator"" _mst;
|
using miniscript::operator""_mst;
|
||||||
using Node = miniscript::Node<CPubKey>;
|
using Node = miniscript::Node<CPubKey>;
|
||||||
|
|
||||||
/** Compute all challenges (pubkeys, hashes, timelocks) that occur in a given Miniscript. */
|
/** Compute all challenges (pubkeys, hashes, timelocks) that occur in a given Miniscript. */
|
||||||
|
|||||||
Reference in new issue
Block a user