From e3f972508612a7fb32c9bd1783717b7d29708dfe Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <zcash@adityapk.com>
Date: Tue, 1 Oct 2019 18:08:41 -0700
Subject: [PATCH] Update serialization versions

---
 src/lightwallet/data.rs | 12 +++---------
 src/lightwallet/mod.rs  | 19 ++++++-------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/lightwallet/data.rs b/src/lightwallet/data.rs
index d1d857a..2142e19 100644
--- a/src/lightwallet/data.rs
+++ b/src/lightwallet/data.rs
@@ -390,7 +390,7 @@ pub struct WalletTx {
 
 impl WalletTx {
     pub fn serialized_version() -> u64 {
-        return 2;
+        return 3;
     }
 
     pub fn new(height: i32, txid: &TxId) -> Self {
@@ -424,15 +424,9 @@ impl WalletTx {
         let total_transparent_value_spent = reader.read_u64::<LittleEndian>()?;
 
         // Outgoing metadata was only added in version 2
-        let outgoing_metadata = match version {
-            1 => vec![],
-            _ => Vector::read(&mut reader, |r| OutgoingTxMetadata::read(r))?
-        };
+        let outgoing_metadata = Vector::read(&mut reader, |r| OutgoingTxMetadata::read(r))?;
 
-        let full_tx_scanned = match version {
-            1 => false,
-            _ => reader.read_u8()? > 0,
-        };
+        let full_tx_scanned = reader.read_u8()? > 0;
             
         Ok(WalletTx{
             block,
diff --git a/src/lightwallet/mod.rs b/src/lightwallet/mod.rs
index 011795e..f29ce06 100644
--- a/src/lightwallet/mod.rs
+++ b/src/lightwallet/mod.rs
@@ -130,7 +130,7 @@ pub struct LightWallet {
 
 impl LightWallet {
     pub fn serialized_version() -> u64 {
-        return 2;
+        return 3;
     }
 
     fn get_pk_from_bip39seed(config: LightClientConfig, bip39seed: &[u8]) ->
@@ -232,21 +232,14 @@ impl LightWallet {
         })?;
         let txs = txs_tuples.into_iter().collect::<HashMap<TxId, WalletTx>>();
 
-        // chain_name was added in v2
-        if version >= 2 {
-            let chain_name = utils::read_string(&mut reader)?;
+        let chain_name = utils::read_string(&mut reader)?;
 
-            if chain_name != config.chain_name {
-                return Err(Error::new(ErrorKind::InvalidData,
-                                      format!("Wallet chain name {} doesn't match expected {}", chain_name, config.chain_name)));
-            }
+        if chain_name != config.chain_name {
+            return Err(Error::new(ErrorKind::InvalidData,
+                                    format!("Wallet chain name {} doesn't match expected {}", chain_name, config.chain_name)));
         }
 
-        let birthday = if version >= 2 {
-            reader.read_u64::<LittleEndian>()?
-        } else {
-            0
-        };
+        let birthday = reader.read_u64::<LittleEndian>()?;
 
         Ok(LightWallet{
             seed:    seed_bytes,