daod: Fix imports.

bin/daod/src/dao_contract/exec/validate.rs

@@ -6,7 +6,7 @@ use pasta_curves::{
 
 use darkfi::{
     crypto::{coin::Coin, keypair::PublicKey, types::DrkCircuitField},
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
 
@@ -102,7 +102,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/dao_contract/mint/validate.rs

@@ -2,7 +2,7 @@ use std::any::{Any, TypeId};
 
 use darkfi::{
     crypto::{keypair::PublicKey, types::DrkCircuitField},
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
 };
 
 use crate::{
@@ -67,7 +67,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/dao_contract/propose/validate.rs

@@ -1,6 +1,6 @@
 use darkfi::{
     crypto::{keypair::PublicKey, merkle_node::MerkleNode, types::DrkCircuitField},
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
 use log::error;
@@ -103,7 +103,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/dao_contract/propose/wallet.rs

@@ -14,7 +14,7 @@ use darkfi::{
         util::{pedersen_commitment_u64, poseidon_hash},
         Proof,
     },
-    util::serial::{SerialDecodable, SerialEncodable},
+    serial::{SerialDecodable, SerialEncodable},
     zk::vm::{Witness, ZkCircuit},
 };
 

bin/daod/src/dao_contract/state.rs

@@ -1,13 +1,15 @@
-use incrementalmerkletree::{bridgetree::BridgeTree, Tree};
-use pasta_curves::{group::Group, pallas};
 use std::{any::Any, collections::HashMap};
 
-use crate::demo::HashableBase;
+use incrementalmerkletree::{bridgetree::BridgeTree, Tree};
+use pasta_curves::{group::Group, pallas};
+
 use darkfi::{
     crypto::{constants::MERKLE_DEPTH, merkle_node::MerkleNode, nullifier::Nullifier},
-    util::serial::{SerialDecodable, SerialEncodable},
+    serial::{SerialDecodable, SerialEncodable},
 };
 
+use crate::demo::HashableBase;
+
 #[derive(Clone, SerialEncodable, SerialDecodable)]
 pub struct DaoBulla(pub pallas::Base);
 

bin/daod/src/dao_contract/vote/validate.rs

@@ -2,7 +2,7 @@ use darkfi::{
     crypto::{
         keypair::PublicKey, merkle_node::MerkleNode, nullifier::Nullifier, types::DrkCircuitField,
     },
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
 use log::error;
@@ -113,7 +113,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/dao_contract/vote/wallet.rs

@@ -6,7 +6,7 @@ use darkfi::{
         util::{pedersen_commitment_u64, poseidon_hash},
         Proof,
     },
-    util::serial::{SerialDecodable, SerialEncodable},
+    serial::{SerialDecodable, SerialEncodable},
     zk::vm::{Witness, ZkCircuit},
 };
 use halo2_proofs::circuit::Value;

bin/daod/src/demo.rs

@@ -1,3 +1,11 @@
+use std::{
+    any::{Any, TypeId},
+    collections::HashMap,
+    hash::Hasher,
+    io,
+    time::Instant,
+};
+
 use incrementalmerkletree::Tree;
 use log::debug;
 use pasta_curves::{
@@ -9,12 +17,6 @@ use pasta_curves::{
     pallas,
 };
 use rand::rngs::OsRng;
-use std::{
-    any::{Any, TypeId},
-    collections::HashMap,
-    hash::Hasher,
-    time::Instant,
-};
 
 use darkfi::{
     crypto::{
@@ -25,7 +27,7 @@ use darkfi::{
         util::{pedersen_commitment_u64, poseidon_hash},
         Proof,
     },
-    util::serial::Encodable,
+    serial::Encodable,
     zk::{
         circuit::{BurnContract, MintContract},
         vm::ZkCircuit,
@@ -188,7 +190,7 @@ pub struct FuncCall {
 }
 
 impl Encodable for FuncCall {
-    fn encode<W: std::io::Write>(&self, mut w: W) -> std::result::Result<usize, darkfi::Error> {
+    fn encode<W: io::Write>(&self, mut w: W) -> core::result::Result<usize, io::Error> {
         let mut len = 0;
         len += self.contract_id.encode(&mut w)?;
         len += self.func_id.encode(&mut w)?;
@@ -212,7 +214,7 @@ pub trait CallDataBase {
     fn encode_bytes(
         &self,
         writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error>;
+    ) -> core::result::Result<usize, std::io::Error>;
 }
 
 type GenericContractState = Box<dyn Any>;

bin/daod/src/example_contract/foo/validate.rs

@@ -2,7 +2,7 @@ use pasta_curves::pallas;
 
 use darkfi::{
     crypto::{keypair::PublicKey, types::DrkCircuitField},
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
 
@@ -52,7 +52,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/money_contract/transfer/validate.rs

@@ -15,7 +15,7 @@ use darkfi::{
         util::{pedersen_commitment_base, pedersen_commitment_u64},
         BurnRevealedValues, MintRevealedValues,
     },
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
 
@@ -207,7 +207,7 @@ impl CallDataBase for CallData {
     fn encode_bytes(
         &self,
         mut writer: &mut dyn std::io::Write,
-    ) -> std::result::Result<usize, darkfi::Error> {
+    ) -> core::result::Result<usize, std::io::Error> {
         self.encode(&mut writer)
     }
 }

bin/daod/src/money_contract/transfer/wallet.rs

@@ -12,7 +12,7 @@ use darkfi::{
             DrkValueBlind,
         },
     },
-    util::serial::{SerialDecodable, SerialEncodable},
+    serial::{SerialDecodable, SerialEncodable},
     Result,
 };
 

bin/daod/src/note.rs

@@ -6,7 +6,7 @@ use darkfi::{
         diffie_hellman::{kdf_sapling, sapling_ka_agree},
         keypair::{PublicKey, SecretKey},
     },
-    util::serial::{Decodable, Encodable, SerialDecodable, SerialEncodable},
+    serial::{Decodable, Encodable, SerialDecodable, SerialEncodable},
     Error, Result,
 };
 
@@ -51,7 +51,8 @@ impl EncryptedNote2 {
             self.ciphertext.len() - AEAD_TAG_SIZE
         );
 
-        T::decode(&plaintext[..])
+        let t = T::decode(&plaintext[..])?;
+        Ok(t)
     }
 }