Fix rebase errors

massalabs · Jan 30, 2023 · fdb4310 · fdb4310
1 parent b6c0ee1
commit fdb4310
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/massa-consensus-exports/src/export_active_block.rs b/massa-consensus-exports/src/export_active_block.rs
@@ -157,7 +157,9 @@ impl Deserializer<ExportActiveBlock> for ExportActiveBlockDeserializer {
     /// ## Example:
     /// ```rust
     /// use massa_consensus_exports::export_active_block::{ExportActiveBlock, ExportActiveBlockDeserializer, ExportActiveBlockSerializer};
-    /// use massa_models::{ledger::LedgerChanges, config::THREAD_COUNT, rolls::RollUpdates, block::{BlockId, Block, BlockSerializer, BlockHeader, BlockHeaderSerializer}, prehash::PreHashSet, endorsement::{Endorsement, EndorsementSerializer}, slot::Slot, secure_share::SecureShareContent};
+    /// use massa_models::{ledger::LedgerChanges, config::THREAD_COUNT, rolls::RollUpdates, block::{Block, BlockSerializer}, prehash::PreHashSet, endorsement::{Endorsement, EndorsementSerializer}, slot::Slot, secure_share::SecureShareContent};
+    /// use massa_models::block_id::BlockId;
+    /// use massa_models::block_header::{BlockHeader, BlockHeaderSerializer};
     /// use massa_hash::Hash;
     /// use std::collections::HashSet;
     /// use massa_signature::KeyPair;

diff --git a/massa-models/src/ledger.rs b/massa-models/src/ledger.rs
@@ -49,7 +49,6 @@ impl LedgerDataSerializer {
 impl Serializer<LedgerData> for LedgerDataSerializer {
     /// ## Example:
     /// ```rust
-    /// use massa_models::ledger::{LedgerData, LedgerDataSerializer};
     /// use massa_models::amount::Amount;
     /// use massa_serialization::Serializer;
     /// use std::str::FromStr;
@@ -93,7 +92,6 @@ impl Default for LedgerDataDeserializer {
 impl Deserializer<LedgerData> for LedgerDataDeserializer {
     /// ## Example:
     /// ```rust
-    /// use massa_models::ledger::{LedgerData, LedgerDataDeserializer, LedgerDataSerializer};
     /// use massa_models::amount::Amount;
     /// use massa_serialization::{Serializer, Deserializer, DeserializeError};
     /// use std::str::FromStr;
@@ -195,9 +193,9 @@ impl LedgerChangeSerializer {
 impl Serializer<LedgerChange> for LedgerChangeSerializer {
     /// ## Example
     /// ```rust
-    /// use massa_models::{address::Address, amount::Amount, ledger::LedgerChangeSerializer};
+    /// use massa_models::{address::Address, amount::Amount};
     /// use std::str::FromStr;
-    /// use massa_models::ledger::LedgerChange;
+    /// use massa_models::ledger::{LedgerChange, LedgerChangeSerializer};
     /// use massa_serialization::Serializer;
     /// let ledger_change = LedgerChange {
     ///   balance_delta: Amount::from_str("1149").unwrap(),
@@ -240,9 +238,9 @@ impl Default for LedgerChangeDeserializer {
 impl Deserializer<LedgerChange> for LedgerChangeDeserializer {
     /// ## Example
     /// ```rust
-    /// use massa_models::{address::Address, amount::Amount, ledger::{LedgerChangeSerializer, LedgerChangeDeserializer}};
+    /// use massa_models::{address::Address, amount::Amount};
     /// use std::str::FromStr;
-    /// use massa_models::ledger::LedgerChange;
+    /// use massa_models::ledger::{LedgerChange, LedgerChangeDeserializer, LedgerChangeSerializer};
     /// use massa_serialization::{Serializer, Deserializer, DeserializeError};
     /// let ledger_change = LedgerChange {
     ///   balance_delta: Amount::from_str("1149").unwrap(),
@@ -379,9 +377,9 @@ impl LedgerChangesDeserializer {
 impl Deserializer<LedgerChanges> for LedgerChangesDeserializer {
     /// ## Example
     /// ```rust
-    /// # use massa_models::{address::Address, amount::Amount, ledger::{LedgerChangesSerializer, LedgerChangesDeserializer, LedgerChangeSerializer, LedgerChangeDeserializer}};
+    /// # use massa_models::{address::Address, amount::Amount};
     /// # use std::str::FromStr;
-    /// # use massa_models::ledger::{LedgerChanges, LedgerChange};
+    /// use massa_models::ledger::{LedgerChange, LedgerChanges, LedgerChangesDeserializer, LedgerChangeSerializer, LedgerChangesSerializer};
     /// # use massa_serialization::{Serializer, Deserializer, DeserializeError};
     /// # let ledger_changes = LedgerChanges(vec![
     /// #   (