private -> crypto/private, and also updating agent call (stubbed, and…

… going to stay that way until net is figured out...).

src/commands/agent.rs

@@ -10,7 +10,9 @@ use stamp_net::Multiaddr;
 use tokio::{task, sync::mpsc as channel};
 use tracing::{warn};
 
-pub fn run(sync_token: Option<SyncToken>, sync_bind: Multiaddr, sync_join: Vec<Multiaddr>, agent_port: u32, agent_lock_after: u64, net_bind: Multiaddr, net_join: Vec<Multiaddr>) -> Result<()> {
+pub fn run(bind: Multiaddr, sync_token: Option<SyncToken>, sync_join: Vec<Multiaddr>, agent_port: u32, agent_lock_after: u64, net: bool, net_join: Vec<Multiaddr>) -> Result<()> {
+    Ok(())
+    /*
     tokio::runtime::Builder::new_current_thread()
         .enable_all()
         .build()?
@@ -64,4 +66,5 @@ pub fn run(sync_token: Option<SyncToken>, sync_bind: Multiaddr, sync_join: Vec<M
             }
             Ok(())
         })
+    */
 }

src/commands/claim.rs

@@ -8,15 +8,17 @@ use crate::{
 use prettytable::Table;
 use stamp_aux;
 use stamp_core::{
-    crypto::base::{SecretKey, rng},
+    crypto::{
+        base::{SecretKey, rng},
+        private::MaybePrivate,
+    },
     dag::{TransactionID, Transactions},
     identity::{
         Identity,
         IdentityID,
         claim::{Claim, ClaimID, ClaimSpec, RelationshipType},
         stamp::{Stamp},
     },
-    private::MaybePrivate,
     rasn::{Encode, Decode},
     util::{Date, Url, Public, BinaryVec, SerText, Timestamp},
 };

src/commands/dag.rs

@@ -9,14 +9,16 @@ use stamp_aux::{
     db::stage_transaction,
 };
 use stamp_core::{
-    crypto::base::KeyID,
+    crypto::{
+        base::KeyID,
+        private::MaybePrivate,
+    },
     dag::{TransactionBody, Transaction, Transactions},
     identity::{
         IdentityID,
         claim::ClaimSpec,
         keychain::Key,
     },
-    private::MaybePrivate,
     util::{SerdeBinary, base64_encode},
 };
 use std::convert::{TryFrom, From};

src/commands/keychain.rs

@@ -13,13 +13,13 @@ use stamp_core::{
     crypto::{
         self,
         base::{KeyID, SecretKey, rng},
+        private::PrivateWithHmac,
     },
     identity::{
         Identity,
         IdentityID,
         keychain::{AdminKey, AdminKeypair, ExtendKeypair, Key, RevocationReason, Subkey},
     },
-    private::PrivateWithHmac,
     util::{Timestamp, Public, base64_encode, base64_decode},
 };
 use std::convert::{TryFrom, TryInto};