diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-21 17:55:49 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-08-02 15:28:10 +0200 |
| commit | fa2a6b8516b24d7e9ca11926a49cf2b07f661e81 (patch) | |
| tree | 1e7f675e3e66591bf4fe200b4eeb787afbab1ed4 /src/policy | |
| parent | fa477d32eefcc3dd2f06b452066290d9936d8c5d (diff) | |
| download | bitcoin-fa2a6b8516b24d7e9ca11926a49cf2b07f661e81.tar.xz | |
Combine datacarrier globals into one
Diffstat (limited to 'src/policy')
| -rw-r--r-- | src/policy/policy.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index f6452266b7..0a79c0a1d8 100644 --- a/src/policy/policy.cpp +++ b/src/policy/policy.cpp @@ -82,9 +82,10 @@ bool IsStandard(const CScript& scriptPubKey, TxoutType& whichType) return false; if (m < 1 || m > n) return false; - } else if (whichType == TxoutType::NULL_DATA && - (!fAcceptDatacarrier || scriptPubKey.size() > nMaxDatacarrierBytes)) { - return false; + } else if (whichType == TxoutType::NULL_DATA) { + if (!g_max_datacarrier_bytes || scriptPubKey.size() > *g_max_datacarrier_bytes) { + return false; + } } return true; |