Fix compilation

Author: thibault-martinez

Cargo.lock

@@ -3,7 +3,7 @@
 
 //! A crate that contains all types and features required to compute and maintain the ledger state.
 
-//#![warn(missing_docs)]
+// #![warn(missing_docs)]
 
 pub mod types;
 #[cfg(feature = "workers")]

bee-ledger/src/lib.rs

@@ -3,7 +3,11 @@
 
 use crate::types::Error;
 
-use bee_message::{address::Address, constants::IOTA_SUPPLY};
+use bee_message::{
+    address::Address,
+    constants::IOTA_SUPPLY,
+    output::{Output, DUST_THRESHOLD},
+};
 
 use std::collections::{
     hash_map::{IntoIter, Iter, IterMut},
@@ -100,6 +104,49 @@ impl BalanceDiffs {
         self.0.get(address)
     }
 
+    /// Negates a `BalanceDiffs`.
+    pub fn negate(&mut self) {
+        for (_, diff) in self.iter_mut() {
+            diff.negate();
+        }
+    }
+
+    pub fn output_add(&mut self, output: &Output) -> Result<(), Error> {
+        match output {
+            Output::SignatureLockedSingle(output) => {
+                self.amount_add(*output.address(), output.amount())?;
+                if output.amount() < DUST_THRESHOLD {
+                    self.dust_outputs_inc(*output.address())?;
+                }
+            }
+            Output::SignatureLockedDustAllowance(output) => {
+                self.amount_add(*output.address(), output.amount())?;
+                self.dust_allowance_add(*output.address(), output.amount())?;
+            }
+            output => return Err(Error::UnsupportedOutputKind(output.kind())),
+        }
+
+        Ok(())
+    }
+
+    pub fn output_sub(&mut self, output: &Output) -> Result<(), Error> {
+        match output {
+            Output::SignatureLockedSingle(output) => {
+                self.amount_sub(*output.address(), output.amount())?;
+                if output.amount() < DUST_THRESHOLD {
+                    self.dust_outputs_dec(*output.address())?;
+                }
+            }
+            Output::SignatureLockedDustAllowance(output) => {
+                self.amount_sub(*output.address(), output.amount())?;
+                self.dust_allowance_sub(*output.address(), output.amount())?;
+            }
+            output => return Err(Error::UnsupportedOutputKind(output.kind())),
+        }
+
+        Ok(())
+    }
+
     /// Adds a given amount to a given address.
     pub fn amount_add(&mut self, address: Address, amount: u64) -> Result<(), Error> {
         let entry = self.0.entry(address).or_default();
@@ -169,13 +216,6 @@ impl BalanceDiffs {
     pub fn iter_mut(&mut self) -> IterMut<'_, Address, BalanceDiff> {
         self.0.iter_mut()
     }
-
-    /// Negates a `BalanceDiffs`.
-    pub fn negate(&mut self) {
-        for (_, diff) in self.iter_mut() {
-            diff.negate();
-        }
-    }
 }
 
 impl IntoIterator for BalanceDiffs {

bee-ledger/src/types/balance_diff.rs

@@ -9,7 +9,7 @@ use bee_message::output::OutputId;
 use std::ops::Deref;
 
 /// Represents an output id as unspent.
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Eq, PartialEq)]
 pub struct Unspent(OutputId);
 
 impl From<OutputId> for Unspent {
@@ -38,6 +38,18 @@ impl Unspent {
     }
 }
 
+impl core::fmt::Display for Unspent {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        write!(f, "{}", *self)
+    }
+}
+
+impl core::fmt::Debug for Unspent {
+    fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+        write!(f, "Unspent({})", self)
+    }
+}
+
 impl Packable for Unspent {
     type Error = Error;
 

bee-ledger/src/types/unspent.rs

@@ -3,8 +3,8 @@
 
 use crate::types::{BalanceDiffs, ConsumedOutput, CreatedOutput};
 
-use bee_ledger_types::types::ConflictReason;
 use bee_message::{milestone::MilestoneIndex, output::OutputId, MessageId};
+use bee_tangle::ConflictReason;
 
 use std::collections::HashMap;
 

bee-ledger/src/workers/consensus/metadata.rs

@@ -10,7 +10,6 @@ use crate::{
     },
 };
 
-use bee_ledger_types::types::ConflictReason;
 use bee_message::{
     address::Address,
     input::Input,
@@ -22,7 +21,7 @@ use bee_message::{
     unlock::{UnlockBlock, UnlockBlocks},
     Message, MessageId,
 };
-use bee_tangle::MsTangle;
+use bee_tangle::{ConflictReason, MsTangle};
 
 use crypto::hashes::blake2b::Blake2b256;
 

bee-ledger/src/workers/consensus/white_flag.rs

@@ -17,15 +17,14 @@ use crate::{
     },
 };
 
-use bee_ledger_types::types::ConflictReason;
 use bee_message::{
     milestone::MilestoneIndex,
     output::{Output, OutputId},
     payload::{milestone::MilestoneId, receipt::ReceiptPayload, transaction::TransactionId, Payload},
     MessageId,
 };
 use bee_runtime::{event::Bus, node::Node, shutdown_stream::ShutdownStream, worker::Worker};
-use bee_tangle::{MsTangle, TangleWorker};
+use bee_tangle::{ConflictReason, MsTangle, TangleWorker};
 
 use async_trait::async_trait;
 

bee-ledger/src/workers/consensus/worker.rs

@@ -3,8 +3,8 @@
 
 use crate::types::{ConsumedOutput, CreatedOutput};
 
-use bee_ledger_types::types::ConflictReason;
 use bee_message::{milestone::MilestoneIndex, MessageId};
+use bee_tangle::ConflictReason;
 
 /// An event that indicates that a milestone was confirmed.
 #[derive(Clone)]