Combine datacarrier globals into one

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;