There is no need for these conditions anymore.
[novacoin.git] / src / init.cpp
index 8fab885..994c784 100644 (file)
@@ -903,14 +903,12 @@ bool AppInit2()
         if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
             strErrors << _("Cannot write default address") << "\n";
 
-        if (fTestNet || GetTime() < SMALLDATA_SWITCH_TIME) {
-            CMalleableKeyView keyView = pwalletMain->GenerateNewMalleableKey();
-            CMalleableKey mKey;
-            if (!pwalletMain->GetMalleableKey(keyView, mKey))
-                strErrors << _("Unable to generate new malleable key");
-            if (!pwalletMain->SetAddressBookName(CBitcoinAddress(keyView.GetMalleablePubKey()), ""))
-                strErrors << _("Cannot write default address") << "\n";
-        }
+        CMalleableKeyView keyView = pwalletMain->GenerateNewMalleableKey();
+        CMalleableKey mKey;
+        if (!pwalletMain->GetMalleableKey(keyView, mKey))
+            strErrors << _("Unable to generate new malleable key");
+        if (!pwalletMain->SetAddressBookName(CBitcoinAddress(keyView.GetMalleablePubKey()), ""))
+            strErrors << _("Cannot write default address") << "\n";
     }
 
     printf("%s", strErrors.str().c_str());