From 31ec6ae92a5d9910a26d90a6ff20bab27dee5826 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Sat, 25 Sep 2021 15:21:57 +0200 Subject: [PATCH] script: make IsPushdataOp non-static We'll need it for Miniscript --- src/script/standard.cpp | 5 ----- src/script/standard.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/script/standard.cpp b/src/script/standard.cpp index b77c78769fd..e25155d3dd7 100644 --- a/src/script/standard.cpp +++ b/src/script/standard.cpp @@ -91,11 +91,6 @@ static constexpr bool IsSmallInteger(opcodetype opcode) return opcode >= OP_1 && opcode <= OP_16; } -static constexpr bool IsPushdataOp(opcodetype opcode) -{ - return opcode > OP_FALSE && opcode <= OP_PUSHDATA4; -} - /** Retrieve a minimally-encoded number in range [min,max] from an (opcode, data) pair, * whether it's OP_n or through a push. */ static std::optional GetScriptNumber(opcodetype opcode, valtype data, int min, int max) diff --git a/src/script/standard.h b/src/script/standard.h index 75bfe2db380..f0b143c52bf 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -162,6 +162,11 @@ bool IsValidDestination(const CTxDestination& dest); /** Get the name of a TxoutType as a string */ std::string GetTxnOutputType(TxoutType t); +constexpr bool IsPushdataOp(opcodetype opcode) +{ + return opcode > OP_FALSE && opcode <= OP_PUSHDATA4; +} + /** * Parse a scriptPubKey and identify script type for standard scripts. If * successful, returns script type and parsed pubkeys or hashes, depending on