Incorporate librustzcash refactor

lib/Cargo.toml

@@ -11,7 +11,8 @@ default = ["printpdf", "secp256k1"]
 rand = "0.5"
 hex = "0.3"
 bech32 = "0.6"
-zip32 = {  git = "https://github.com/adityapk00/librustzcash", branch = "forked/paperpub" }
+zcash_primitives = {  git = "https://github.com/adityapk00/librustzcash", branch = "paperwallet" }
+#zcash_primitives = { path = "../../librustzcash/zcash_primitives" }
 json = "0.11.14"    
 qrcode = { version = "0.8", default-features = false }
 printpdf = { version = "0.2.8", optional = true }

lib/src/paper.rs

@@ -12,8 +12,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 use std::panic;
 use std::time::{SystemTime};
-use zip32::{DiversifierIndex, DiversifierKey};
-use zip32::{ChildIndex, ExtendedSpendingKey, ExtendedFullViewingKey};
+use zcash_primitives::zip32::{DiversifierIndex, DiversifierKey, ChildIndex, ExtendedSpendingKey, ExtendedFullViewingKey};
 
 /// A trait for converting a [u8] to base58 encoded string.
 pub trait ToBase58Check {