[ouroboros] under consensus

example/crypsinous.rs

@@ -1,5 +1,6 @@
 use ::darkfi::{
-    net::Settings, stakeholder::{Stakeholder, EpochConsensus},util::time::Timestamp,
+    net::Settings,
+    consensus::ouroboros::{Stakeholder, EpochConsensus},util::time::Timestamp,
 };
 
 use clap::Parser;

example/lead.rs

@@ -7,7 +7,7 @@ use url::Url;
 use darkfi::{
     crypto::leadcoin::{LeadCoin, LEAD_PUBLIC_INPUT_LEN},
     net::Settings,
-    stakeholder::{Stakeholder, Epoch, EpochConsensus},
+    consensus::ouroboros::{Stakeholder, Epoch, EpochConsensus},
 };
 
 

src/consensus/mod.rs

@@ -27,6 +27,8 @@ pub mod task;
 pub mod clock;
 pub use clock::{Clock, Ticks};
 
+pub mod ouroboros;
+
 use lazy_static::lazy_static;
 lazy_static! {
     /// Genesis hash for the mainnet chain

src/stakeholder/epoch.rs → src/consensus/ouroboros/epoch.rs

@@ -12,23 +12,26 @@ use pasta_curves::{
 
 use rand::{thread_rng, Rng};
 
-use crate::crypto::{
-    coin::OwnCoin,
-    constants::MERKLE_DEPTH_ORCHARD,
-    keypair::{Keypair, SecretKey},
-    lead_proof,
-    leadcoin::LeadCoin,
-    merkle_node::MerkleNode,
-    proof::{Proof, ProvingKey},
-    types::DrkValueBlind,
-    util::{mod_r_p, pedersen_commitment_base, pedersen_commitment_u64},
-
+use crate::{
+    crypto::{
+        coin::OwnCoin,
+        constants::MERKLE_DEPTH_ORCHARD,
+        keypair::{Keypair, SecretKey},
+        lead_proof,
+        leadcoin::LeadCoin,
+        merkle_node::MerkleNode,
+        proof::{Proof, ProvingKey},
+        types::DrkValueBlind,
+        util::{mod_r_p, pedersen_commitment_base, pedersen_commitment_u64},
+    },
+    consensus::ouroboros::{
+        EpochConsensus,
+        utils::{fbig2ibig, base2ibig},
+        Float10,
+        consts::{RADIX_BITS},
+    }
 };
 
-use crate::stakeholder::EpochConsensus;
-use crate::stakeholder::utils::{fbig2ibig, base2ibig};
-use crate::stakeholder::Float10;
-use crate::stakeholder::consts::{RADIX_BITS};
 
 
 const PRF_NULLIFIER_PREFIX: u64 = 0;

src/stakeholder/mod.rs → src/consensus/ouroboros/mod.rs

@@ -20,6 +20,11 @@ use crate::{
         clock::{Clock, Ticks},
         Block, BlockInfo, Header, Metadata,
         LeadProof,
+        ouroboros::{
+            types::{Float10},
+            consts::{RADIX_BITS, LOG_T, TREE_LEN, P},
+            utils::{fbig2base},
+        },
     },
     crypto::{
         address::Address,
@@ -42,9 +47,7 @@ use crate::{
         Transaction,
     },
     util::{path::expand_path, time::Timestamp},
-    stakeholder::types::{Float10},
-    stakeholder::consts::{RADIX_BITS, LOG_T, TREE_LEN, P},
-    stakeholder::utils::{fbig2base},
+
     Result,
 };
 

src/stakeholder/utils.rs → src/consensus/ouroboros/utils.rs

@@ -1,7 +1,7 @@
 use pasta_curves::pallas;
 use group::ff::PrimeField;
 use dashu::integer::{IBig, Sign, UBig};
-use crate::stakeholder::Float10;
+use crate::consensus::ouroboros::Float10;
 use log::{info};
 
 pub(crate) fn fbig2ibig(f: Float10) -> IBig {

src/lib.rs

@@ -4,9 +4,6 @@ pub use error::{ClientFailed, ClientResult, Error, Result, VerifyFailed, VerifyR
 #[cfg(feature = "blockchain")]
 pub mod blockchain;
 
-#[cfg(feature = "blockchain")]
-pub mod stakeholder;
-
 #[cfg(feature = "blockchain")]
 pub mod consensus;