Merge pull request 'Remove debugging' (#79) from rav001 into dev040

Reviewed-on: #79

librustzcash-wrapper/src/lib.rs

@@ -1656,7 +1656,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
             None
         }
     };
-    println!("{:?}", sap_anchor);
+    //println!("{:?}", sap_anchor);
     let orch_wit_in: Vec<u8> = marshall_from_haskell_var(orch_wit, orch_wit_len, RW);
     let orch_wit_reader = Cursor::new(orch_wit_in);
     let orch_iw = read_commitment_tree::<MerkleHashOrchard, Cursor<Vec<u8>>, 32>(orch_wit_reader);
@@ -1678,7 +1678,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
             if net {
                 match main_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) {
                     Ok(()) => {
-                        println!("added t-input in main");
+                        //println!("added t-input in main");
                         continue;
                     },
                     Err(_e) => { println!("Error reading transparent input"); }
@@ -1686,7 +1686,7 @@ pub extern "C" fn rust_wrapper_create_transaction(
             } else {
                 match test_builder.add_transparent_input(k, t_in.utxo.unpack(), t_in.coin.unpack()) {
                     Ok(()) => {
-                        println!("added t-input in test");
+                        //println!("added t-input in test");
                         continue;
                     },
                     Err(_e) => { println!("Error reading transparent input"); }
@@ -1774,13 +1774,12 @@ pub extern "C" fn rust_wrapper_create_transaction(
                 }
             },
             4 => {
-                //let sk = SpendingKey::from_bytes(output.ovk[0..32].try_into().unwrap()).unwrap();
+                let sk = SpendingKey::from_bytes(output.ovk[0..32].try_into().unwrap()).unwrap();
-                //let ovk = if output.chg {
+                let ovk = if output.chg {
-                    //Some(FullViewingKey::from(&sk).to_ovk(Scope::Internal))
+                    Some(FullViewingKey::from(&sk).to_ovk(Scope::Internal))
-                //} else {
+                } else {
-                    //Some(FullViewingKey::from(&sk).to_ovk(Scope::External))
+                    Some(FullViewingKey::from(&sk).to_ovk(Scope::External))
-                        //};
+                        };
-                let ovk = None;
                 let recipient = OrchardAddress::from_raw_address_bytes(&to_array(output.to)).unwrap();
                 let val = output.amt;
                 let memo = MemoBytes::from_bytes(&output.memo).unwrap();