X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fkey.cpp;h=6c0a57dd131e21b2ae8989bdfcf2a173444128b6;hb=9d14e64825d95061ea0857267646dfcb3d62e07a;hp=a1ab2a398b7377cd060f2c2191d64587446da10f;hpb=b8ceacbeab5a95713f626694117b630574a2e52f;p=novacoin.git

diff --git a/src/key.cpp b/src/key.cpp
index a1ab2a3..6c0a57d 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -780,15 +780,6 @@ CMalleableKey::CMalleableKey(const CSecret &L, const CSecret &H)
     SetSecrets(L, H);
 }
 
-/*
-CMalleableKey& CMalleableKey::operator=(const CMalleableKey &b)
-{
-    SetSecrets(b.vchSecretL, b.vchSecretH);
-
-    return (*this);
-}
-*/
-
 CMalleableKey::~CMalleableKey()
 {
 }
@@ -816,12 +807,6 @@ bool CMalleableKey::SetSecrets(const CSecret &pvchSecretL, const CSecret &pvchSe
     return true;
 }
 
-void CMalleableKey::GetSecrets(CSecret &pvchSecretL, CSecret &pvchSecretH) const
-{
-    pvchSecretL = vchSecretL;
-    pvchSecretH = vchSecretH;
-}
-
 CMalleablePubKey CMalleableKey::GetMalleablePubKey() const
 {
     CKey L, H;
@@ -1012,11 +997,16 @@ bool CMalleableKey::SetString(const std::string& strMutableKey)
     CDataStream ssKey(vchTemp, SER_NETWORK, PROTOCOL_VERSION);
     ssKey >> *this;
 
-    return IsNull();
+    return IsValid();
 }
 
 // CMalleableKeyView
 
+CMalleableKeyView::CMalleableKeyView(const std::string &strMalleableKey)
+{
+    SetString(strMalleableKey);
+}
+
 CMalleableKeyView::CMalleableKeyView(const CMalleableKey &b)
 {
     if (b.vchSecretL.size() != 32)
@@ -1041,13 +1031,6 @@ CMalleableKeyView::CMalleableKeyView(const CMalleableKeyView &b)
     nVersion = CURRENT_VERSION;
 }
 
-CMalleableKeyView::CMalleableKeyView(const CSecret &L, const CPubKey &pvchPubKeyH)
-{
-    vchSecretL = L;
-    vchPubKeyH = pvchPubKeyH.Raw();
-    nVersion = CURRENT_VERSION;
-}
-
 CMalleableKeyView& CMalleableKeyView::operator=(const CMalleableKey &b)
 {
     vchSecretL = b.vchSecretL;
@@ -1152,7 +1135,7 @@ bool CMalleableKeyView::SetString(const std::string& strMutableKey)
     CDataStream ssKey(vchTemp, SER_NETWORK, PROTOCOL_VERSION);
     ssKey >> *this;
 
-    return IsNull();
+    return IsValid();
 }
 
 std::vector<unsigned char> CMalleableKeyView::Raw() const