bin/dao: rearrange imports

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

@@ -1,3 +1,5 @@
+use std::any::{Any, TypeId};
+
 use pasta_curves::{
     arithmetic::CurveAffine,
     group::{Curve, Group},
@@ -10,8 +12,6 @@ use darkfi::{
     Error as DarkFiError,
 };
 
-use std::any::{Any, TypeId};
-
 use crate::{
     contract::{dao_contract, dao_contract::CONTRACT_ID, money_contract},
     util::{CallDataBase, HashableBase, StateRegistry, Transaction, UpdateBase},

bin/dao/daod/src/contract/dao_contract/exec/wallet.rs

@@ -1,8 +1,7 @@
-use log::debug;
-use rand::rngs::OsRng;
-
 use halo2_proofs::circuit::Value;
+use log::debug;
 use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
+use rand::rngs::OsRng;
 
 use darkfi::{
     crypto::{

bin/dao/daod/src/contract/dao_contract/mint/wallet.rs

@@ -1,3 +1,7 @@
+use halo2_proofs::circuit::Value;
+use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
+use rand::rngs::OsRng;
+
 use darkfi::{
     crypto::{
         keypair::{PublicKey, SecretKey},
@@ -6,9 +10,6 @@ use darkfi::{
     },
     zk::vm::{Witness, ZkCircuit},
 };
-use halo2_proofs::circuit::Value;
-use pasta_curves::{arithmetic::CurveAffine, group::Curve, pallas};
-use rand::rngs::OsRng;
 
 use crate::{
     contract::dao_contract::{mint::validate::CallData, state::DaoBulla, CONTRACT_ID},

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

@@ -1,15 +1,17 @@
-use darkfi::{
-    crypto::{keypair::PublicKey, merkle_node::MerkleNode, types::DrkCircuitField},
-    util::serial::{Encodable, SerialDecodable, SerialEncodable},
-    Error as DarkFiError,
-};
+use std::any::{Any, TypeId};
+
 use log::error;
 use pasta_curves::{
     arithmetic::CurveAffine,
     group::{Curve, Group},
     pallas,
 };
-use std::any::{Any, TypeId};
+
+use darkfi::{
+    crypto::{keypair::PublicKey, merkle_node::MerkleNode, types::DrkCircuitField},
+    util::serial::{Encodable, SerialDecodable, SerialEncodable},
+    Error as DarkFiError,
+};
 
 use crate::{
     contract::{

bin/dao/daod/src/contract/dao_contract/state.rs

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

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

@@ -1,3 +1,12 @@
+use std::any::{Any, TypeId};
+
+use log::error;
+use pasta_curves::{
+    arithmetic::CurveAffine,
+    group::{Curve, Group},
+    pallas,
+};
+
 use darkfi::{
     crypto::{
         keypair::PublicKey, merkle_node::MerkleNode, nullifier::Nullifier, types::DrkCircuitField,
@@ -5,13 +14,6 @@ use darkfi::{
     util::serial::{Encodable, SerialDecodable, SerialEncodable},
     Error as DarkFiError,
 };
-use log::error;
-use pasta_curves::{
-    arithmetic::CurveAffine,
-    group::{Curve, Group},
-    pallas,
-};
-use std::any::{Any, TypeId};
 
 use crate::{
     contract::{

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

@@ -1,3 +1,13 @@
+use halo2_proofs::circuit::Value;
+use incrementalmerkletree::Hashable;
+use log::debug;
+use pasta_curves::{
+    arithmetic::CurveAffine,
+    group::{ff::Field, Curve},
+    pallas,
+};
+use rand::rngs::OsRng;
+
 use darkfi::{
     crypto::{
         keypair::{Keypair, PublicKey, SecretKey},
@@ -9,14 +19,6 @@ use darkfi::{
     util::serial::{SerialDecodable, SerialEncodable},
     zk::vm::{Witness, ZkCircuit},
 };
-use halo2_proofs::circuit::Value;
-use incrementalmerkletree::Hashable;
-use pasta_curves::{
-    arithmetic::CurveAffine,
-    group::{ff::Field, Curve},
-    pallas,
-};
-use rand::rngs::OsRng;
 
 use crate::{
     contract::{
@@ -32,8 +34,6 @@ use crate::{
     util::{FuncCall, ZkContractInfo, ZkContractTable},
 };
 
-use log::debug;
-
 #[derive(SerialEncodable, SerialDecodable)]
 pub struct Note {
     pub vote: Vote,

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

@@ -1,3 +1,5 @@
+use std::any::Any;
+
 use pasta_curves::pallas;
 
 use darkfi::{
@@ -6,8 +8,6 @@ use darkfi::{
     Error as DarkFiError,
 };
 
-use std::any::Any;
-
 use crate::{
     contract::example_contract::{state::State, CONTRACT_ID},
     util::{CallDataBase, StateRegistry, UpdateBase},

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

@@ -2,7 +2,6 @@ use std::any::{Any, TypeId};
 
 use incrementalmerkletree::Tree;
 use log::{debug, error};
-
 use pasta_curves::{group::Group, pallas};
 
 use darkfi::{

bin/dao/daod/src/rpc.rs

@@ -1,12 +1,10 @@
-use std::sync::Arc;
-
 use async_std::sync::Mutex;
+use std::{str::FromStr, sync::Arc};
+
 use async_trait::async_trait;
 use log::debug;
 use pasta_curves::{group::ff::PrimeField, pallas};
 use rand::rngs::OsRng;
-use std::str::FromStr;
-
 use serde_json::{json, Value};
 
 use darkfi::{

bin/dao/daod/src/util.rs

@@ -1,3 +1,5 @@
+use std::{any::Any, collections::HashMap, hash::Hasher};
+
 use lazy_static::lazy_static;
 use log::debug;
 use pasta_curves::{
@@ -5,7 +7,6 @@ use pasta_curves::{
     pallas,
 };
 use rand::rngs::OsRng;
-use std::{any::Any, collections::HashMap, hash::Hasher};
 
 use darkfi::{
     crypto::{