aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/key.h19
-rw-r--r--src/pubkey.h25
-rw-r--r--src/test/bip32_tests.cpp16
3 files changed, 0 insertions, 60 deletions
diff --git a/src/key.h b/src/key.h
index 67e2cfc094..6a86b0411d 100644
--- a/src/key.h
+++ b/src/key.h
@@ -162,25 +162,6 @@ struct CExtKey {
bool Derive(CExtKey& out, unsigned int nChild) const;
CExtPubKey Neuter() const;
void SetSeed(const unsigned char* seed, unsigned int nSeedLen);
- template <typename Stream>
- void Serialize(Stream& s) const
- {
- unsigned int len = BIP32_EXTKEY_SIZE;
- ::WriteCompactSize(s, len);
- unsigned char code[BIP32_EXTKEY_SIZE];
- Encode(code);
- s.write((const char *)&code[0], len);
- }
- template <typename Stream>
- void Unserialize(Stream& s)
- {
- unsigned int len = ::ReadCompactSize(s);
- unsigned char code[BIP32_EXTKEY_SIZE];
- if (len != BIP32_EXTKEY_SIZE)
- throw std::runtime_error("Invalid extended key size\n");
- s.read((char *)&code[0], len);
- Decode(code);
- }
};
/** Initialize the elliptic curve support. May not be called twice without calling ECC_Stop first. */
diff --git a/src/pubkey.h b/src/pubkey.h
index 089324ffda..fd815a871b 100644
--- a/src/pubkey.h
+++ b/src/pubkey.h
@@ -222,31 +222,6 @@ struct CExtPubKey {
void Encode(unsigned char code[BIP32_EXTKEY_SIZE]) const;
void Decode(const unsigned char code[BIP32_EXTKEY_SIZE]);
bool Derive(CExtPubKey& out, unsigned int nChild) const;
-
- void Serialize(CSizeComputer& s) const
- {
- // Optimized implementation for ::GetSerializeSize that avoids copying.
- s.seek(BIP32_EXTKEY_SIZE + 1); // add one byte for the size (compact int)
- }
- template <typename Stream>
- void Serialize(Stream& s) const
- {
- unsigned int len = BIP32_EXTKEY_SIZE;
- ::WriteCompactSize(s, len);
- unsigned char code[BIP32_EXTKEY_SIZE];
- Encode(code);
- s.write((const char *)&code[0], len);
- }
- template <typename Stream>
- void Unserialize(Stream& s)
- {
- unsigned int len = ::ReadCompactSize(s);
- unsigned char code[BIP32_EXTKEY_SIZE];
- if (len != BIP32_EXTKEY_SIZE)
- throw std::runtime_error("Invalid extended key size\n");
- s.read((char *)&code[0], len);
- Decode(code);
- }
};
/** Users of this module must hold an ECCVerifyHandle. The constructor and
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index 660df00964..e46cf624cf 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -118,22 +118,6 @@ static void RunTest(const TestVector &test) {
}
key = keyNew;
pubkey = pubkeyNew;
-
- CDataStream ssPub(SER_DISK, CLIENT_VERSION);
- ssPub << pubkeyNew;
- BOOST_CHECK(ssPub.size() == 75);
-
- CDataStream ssPriv(SER_DISK, CLIENT_VERSION);
- ssPriv << keyNew;
- BOOST_CHECK(ssPriv.size() == 75);
-
- CExtPubKey pubCheck;
- CExtKey privCheck;
- ssPub >> pubCheck;
- ssPriv >> privCheck;
-
- BOOST_CHECK(pubCheck == pubkeyNew);
- BOOST_CHECK(privCheck == keyNew);
}
}