Remove COINBASE_SIGOPS_SWITCH_TIME

diff --git a/src/main.cpp b/src/main.cpp
index 404e135..c8769af 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -429,7 +429,7 @@ unsigned int
 CTransaction::GetLegacySigOpCount() const
 {
     unsigned int nSigOps = 0;
-    if (!IsCoinBase() || nTime < COINBASE_SIGOPS_SWITCH_TIME)
+    if (!IsCoinBase())
     {
         // Coinbase scriptsigs are never executed, so there is 
         //    no sense in calculation of sigops.

diff --git a/src/timestamps.h b/src/timestamps.h
index eb45fa4..bc4b950 100644 (file)
--- a/src/timestamps.h
+++ b/src/timestamps.h
@@ -2,7 +2,6 @@
 #define BITCOIN_TIMESTAMPS_H
 
 static const unsigned int TARGETS_SWITCH_TIME = 1374278400; // Saturday, 20-Jul-2013 00:00:00 UTC
-static const unsigned int COINBASE_SIGOPS_SWITCH_TIME = 1447977600; // Friday, 20-Nov-15 00:00:00 UTC
 static const unsigned int SMALLDATA_SWITCH_TIME = 1458432000; // Sunday, 20-Mar-16 00:00:00 UTC
 static const unsigned int CHECKLOCKTIMEVERIFY_SWITCH_TIME = 1461110400; // Wednesday, 20-Apr-16 00:00:00 UTC
 #endif