From 2851b77312b55c8868acd4cd2c118e5a034606b7 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter.wuille@gmail.com>
Date: Wed, 28 Jun 2017 15:49:13 -0700
Subject: Make all script verification flags softforks

---
 src/script/interpreter.cpp | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'src/script/interpreter.cpp')

diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index 7149c938f..d90abdaf5 100644
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@@ -349,9 +349,6 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                 {
                     if (!(flags & SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)) {
                         // not enabled; treat as a NOP2
-                        if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) {
-                            return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS);
-                        }
                         break;
                     }
 
@@ -391,9 +388,6 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
                 {
                     if (!(flags & SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)) {
                         // not enabled; treat as a NOP3
-                        if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) {
-                            return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS);
-                        }
                         break;
                     }
 
-- 
cgit v1.2.3