Move MilestoneIndex to milestone payload module

bee-api/bee-rest-api/src/endpoints/path_params.rs

@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use bee_gossip::PeerId;
-use bee_message::{milestone::MilestoneIndex, output::OutputId, payload::transaction::TransactionId, MessageId};
+use bee_message::{
+    output::OutputId,
+    payload::{milestone::MilestoneIndex, transaction::TransactionId},
+    MessageId,
+};
 use warp::{reject, Filter, Rejection};
 
 use crate::endpoints::rejection::CustomRejection;

bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/white_flag.rs

@@ -10,7 +10,7 @@ use std::{
 };
 
 use bee_ledger::workers::consensus::{self, WhiteFlagMetadata};
-use bee_message::{milestone::MilestoneIndex, MessageId};
+use bee_message::{payload::milestone::MilestoneIndex, MessageId};
 use bee_protocol::workers::{event::MessageSolidified, request_message, MessageRequesterWorker, RequestedMessages};
 use bee_runtime::{event::Bus, resource::ResourceHandle};
 use bee_tangle::Tangle;

bee-api/bee-rest-api/src/endpoints/routes/api/v2/milestone.rs

@@ -3,7 +3,7 @@
 
 use std::net::IpAddr;
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_runtime::resource::ResourceHandle;
 use bee_tangle::Tangle;
 use warp::{filters::BoxedFilter, reject, Filter, Rejection, Reply};

bee-api/bee-rest-api/src/endpoints/routes/api/v2/milestone_utxo_changes.rs

@@ -4,7 +4,7 @@
 use std::net::IpAddr;
 
 use bee_ledger::types::OutputDiff;
-use bee_message::{milestone::MilestoneIndex, output::OutputId};
+use bee_message::{output::OutputId, payload::milestone::MilestoneIndex};
 use bee_runtime::resource::ResourceHandle;
 use bee_storage::access::Fetch;
 use warp::{filters::BoxedFilter, reject, Filter, Rejection, Reply};

bee-api/bee-rest-api/src/endpoints/routes/api/v2/receipts.rs

@@ -4,7 +4,7 @@
 use std::net::IpAddr;
 
 use bee_ledger::types::Receipt;
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_runtime::resource::ResourceHandle;
 use bee_storage::access::AsIterator;
 use warp::{filters::BoxedFilter, Filter, Rejection, Reply};

bee-api/bee-rest-api/src/endpoints/routes/api/v2/receipts_at.rs

@@ -4,7 +4,7 @@
 use std::net::IpAddr;
 
 use bee_ledger::types::Receipt;
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_runtime::resource::ResourceHandle;
 use bee_storage::access::Fetch;
 use warp::{filters::BoxedFilter, Filter, Rejection, Reply};

bee-api/bee-rest-api/src/endpoints/storage.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use bee_ledger::types::{ConsumedOutput, OutputDiff, Receipt};
-use bee_message::{address::Ed25519Address, milestone::MilestoneIndex, output::OutputId};
+use bee_message::{address::Ed25519Address, output::OutputId, payload::milestone::MilestoneIndex};
 use bee_storage::{
     access::{AsIterator, Fetch},
     backend,

bee-ledger/src/types/consumed_output.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::{milestone::MilestoneIndex, payload::transaction::TransactionId};
+use bee_message::payload::{milestone::MilestoneIndex, transaction::TransactionId};
 
 /// Represents a newly consumed output.
 #[derive(Clone, Debug, Eq, PartialEq, packable::Packable)]

bee-ledger/src/types/created_output.rs

@@ -3,7 +3,7 @@
 
 use core::ops::Deref;
 
-use bee_message::{milestone::MilestoneIndex, output::Output, MessageId};
+use bee_message::{output::Output, payload::milestone::MilestoneIndex, MessageId};
 
 use crate::types::error::Error;
 

bee-ledger/src/types/ledger_index.rs

@@ -3,7 +3,7 @@
 
 use core::ops::Deref;
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 
 /// A wrapper type to represent the current ledger index.
 #[derive(Debug, Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd, packable::Packable)]

bee-ledger/src/types/receipt.rs

@@ -1,7 +1,10 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::{constant::TOKEN_SUPPLY, milestone::MilestoneIndex, payload::milestone::ReceiptMilestoneOption};
+use bee_message::{
+    constant::TOKEN_SUPPLY,
+    payload::milestone::{MilestoneIndex, ReceiptMilestoneOption},
+};
 
 use crate::types::{error::Error, TreasuryOutput};
 

bee-ledger/src/types/snapshot/header.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::{milestone::MilestoneIndex, payload::milestone::MilestoneId};
+use bee_message::payload::milestone::{MilestoneId, MilestoneIndex};
 use packable::{
     error::{UnpackError, UnpackErrorExt},
     packer::Packer,

bee-ledger/src/types/snapshot/info.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 
 /// Snapshot information to be stored.
 #[derive(Clone, Debug, Eq, PartialEq, packable::Packable)]

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

@@ -4,7 +4,10 @@
 use std::collections::HashMap;
 
 use bee_message::{
-    milestone::MilestoneIndex, output::OutputId, payload::milestone::MilestoneId, semantic::ConflictReason, MessageId,
+    output::OutputId,
+    payload::milestone::{MilestoneId, MilestoneIndex},
+    semantic::ConflictReason,
+    MessageId,
 };
 
 use crate::types::{ConsumedOutput, CreatedOutput};

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

@@ -5,10 +5,9 @@ use std::any::TypeId;
 
 use async_trait::async_trait;
 use bee_message::{
-    milestone::MilestoneIndex,
     output::{unlock_condition::AddressUnlockCondition, BasicOutput, Output, OutputId},
     payload::{
-        milestone::{MilestoneId, ReceiptMilestoneOption},
+        milestone::{MilestoneId, MilestoneIndex, ReceiptMilestoneOption},
         transaction::TransactionId,
         Payload,
     },

bee-ledger/src/workers/error.rs

@@ -5,7 +5,7 @@
 
 use std::convert::Infallible;
 
-use bee_message::{milestone::MilestoneIndex, Error as MessageError, MessageId};
+use bee_message::{payload::milestone::MilestoneIndex, Error as MessageError, MessageId};
 use packable::error::UnpackError;
 
 use crate::{

bee-ledger/src/workers/event.rs

@@ -6,8 +6,8 @@
 use std::collections::HashMap;
 
 use bee_message::{
-    milestone::MilestoneIndex,
     output::{Output, OutputId},
+    payload::milestone::MilestoneIndex,
     semantic::ConflictReason,
     MessageId,
 };

bee-ledger/src/workers/pruning/batch.rs

@@ -3,11 +3,7 @@
 
 use std::collections::VecDeque;
 
-use bee_message::{
-    milestone::{Milestone, MilestoneIndex},
-    output::OutputId,
-    Message, MessageId,
-};
+use bee_message::{milestone::Milestone, output::OutputId, payload::milestone::MilestoneIndex, Message, MessageId};
 use bee_storage::access::{Batch, Fetch};
 use bee_tangle::{
     metadata::MessageMetadata, solid_entry_point::SolidEntryPoint, unreferenced_message::UnreferencedMessage, Tangle,

bee-ledger/src/workers/pruning/condition.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_tangle::{storage::StorageBackend, Tangle};
 
 use crate::{types::LedgerIndex, workers::pruning::config::PruningConfig};

bee-ledger/src/workers/pruning/error.rs

@@ -1,7 +1,7 @@
 // Copyright 2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::{milestone::MilestoneIndex, MessageId};
+use bee_message::{payload::milestone::MilestoneIndex, MessageId};
 
 #[derive(Debug, thiserror::Error)]
 pub enum Error {

bee-ledger/src/workers/pruning/prune.rs

@@ -6,7 +6,7 @@ use std::{
     time::{Instant, SystemTime},
 };
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_runtime::event::Bus;
 use bee_storage::access::{Batch, Truncate};
 use bee_tangle::{solid_entry_point::SolidEntryPoint, Tangle};

bee-ledger/src/workers/snapshot/download.rs

@@ -3,7 +3,7 @@
 
 use std::{io::Read, path::Path};
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bytes::Buf;
 use futures::{future::join_all, StreamExt};
 use log::{debug, info, warn};

bee-ledger/src/workers/snapshot/error.rs

@@ -1,7 +1,7 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use thiserror::Error;
 
 use crate::types::{snapshot::SnapshotKind, Error as TypesError};

bee-ledger/src/workers/snapshot/import.rs

@@ -9,8 +9,8 @@ use std::{
 };
 
 use bee_message::{
-    milestone::MilestoneIndex,
     output::{self, OutputId},
+    payload::milestone::MilestoneIndex,
 };
 use bee_storage::access::{Insert, Truncate};
 use bee_tangle::solid_entry_point::SolidEntryPoint;

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

@@ -4,7 +4,7 @@
 use std::{any::TypeId, collections::HashMap};
 
 use async_trait::async_trait;
-use bee_message::milestone::MilestoneIndex;
+use bee_message::payload::milestone::MilestoneIndex;
 use bee_runtime::{node::Node, worker::Worker};
 use bee_storage::{access::AsIterator, backend::StorageBackend as _, system::StorageHealth};
 use bee_tangle::{solid_entry_point::SolidEntryPoint, Tangle, TangleWorker};

bee-ledger/src/workers/storage.rs

@@ -5,11 +5,7 @@
 
 use std::collections::HashMap;
 
-use bee_message::{
-    milestone::{Milestone, MilestoneIndex},
-    output::OutputId,
-    Message, MessageId,
-};
+use bee_message::{milestone::Milestone, output::OutputId, payload::milestone::MilestoneIndex, Message, MessageId};
 use bee_storage::{
     access::{AsIterator, Batch, BatchBuilder, Exist, Fetch, Insert, Truncate},
     backend,

bee-message/src/dto.rs

@@ -4,7 +4,7 @@
 use primitive_types::U256;
 use serde::{Deserialize, Serialize};
 
-use crate::milestone::MilestoneIndex;
+use crate::payload::milestone::MilestoneIndex;
 
 /// Describes a U256.
 #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)]

bee-message/src/milestone/mod.rs

@@ -1,9 +1,6 @@
 // Copyright 2020-2021 IOTA Stiftung
 // SPDX-License-Identifier: Apache-2.0
 
-mod index;
-
-pub use self::index::MilestoneIndex;
 use crate::MessageId;
 
 /// Defines a coordinator milestone.

bee-message/src/output/byte_cost.rs

@@ -3,7 +3,7 @@
 
 use core::mem::size_of;
 
-use crate::{milestone::MilestoneIndex, output::OutputId, MessageId};
+use crate::{output::OutputId, payload::milestone::MilestoneIndex, MessageId};
 
 const DEFAULT_BYTE_COST: u64 = 500;
 const DEFAULT_BYTE_COST_FACTOR_KEY: u64 = 10;

bee-message/src/output/unlock_condition/expiration.rs

@@ -9,7 +9,7 @@ use packable::{
     Packable,
 };
 
-use crate::{address::Address, milestone::MilestoneIndex, Error};
+use crate::{address::Address, payload::milestone::MilestoneIndex, Error};
 
 /// Defines a milestone index and/or unix time until which only Address, defined in Address Unlock Condition, is allowed
 /// to unlock the output. After the milestone index and/or unix time, only Return Address can unlock it.
@@ -127,7 +127,7 @@ pub mod dto {
     use crate::{
         address::dto::AddressDto,
         dto::{is_zero, is_zero_milestone},
-        milestone::MilestoneIndex,
+        payload::milestone::MilestoneIndex,
     };
 
     #[derive(Clone, Debug, Serialize, Deserialize)]

bee-message/src/output/unlock_condition/mod.rs

@@ -23,7 +23,7 @@ pub use self::{
     state_controller_address::StateControllerAddressUnlockCondition,
     storage_deposit_return::StorageDepositReturnUnlockCondition, timelock::TimelockUnlockCondition,
 };
-use crate::{address::Address, create_bitflags, milestone::MilestoneIndex, Error};
+use crate::{address::Address, create_bitflags, payload::milestone::MilestoneIndex, Error};
 
 ///
 #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, From, Packable)]

bee-message/src/output/unlock_condition/timelock.rs

@@ -9,7 +9,7 @@ use packable::{
     Packable,
 };
 
-use crate::{milestone::MilestoneIndex, Error};
+use crate::{payload::milestone::MilestoneIndex, Error};
 
 /// Defines a milestone index and/or unix timestamp until which the output can not be unlocked.
 #[derive(Clone, Debug, Eq, PartialEq, Ord, PartialOrd, From)]
@@ -92,7 +92,7 @@ pub mod dto {
 
     use crate::{
         dto::{is_zero, is_zero_milestone},
-        milestone::MilestoneIndex,
+        payload::milestone::MilestoneIndex,
     };
 
     #[derive(Clone, Debug, Serialize, Deserialize)]

bee-message/src/payload/milestone/essence.rs

@@ -12,9 +12,8 @@ use packable::{
 };
 
 use crate::{
-    milestone::MilestoneIndex,
     parent::Parents,
-    payload::milestone::{MilestoneId, MilestoneOptions},
+    payload::milestone::{MilestoneId, MilestoneIndex, MilestoneOptions},
     Error,
 };
 

bee-message/src/payload/milestone/mod.rs

@@ -4,6 +4,7 @@
 //! Module describing the milestone payload.
 
 mod essence;
+mod index;
 mod milestone_id;
 
 ///
@@ -20,6 +21,7 @@ use packable::{bounded::BoundedU8, prefix::VecPrefix, Packable};
 pub(crate) use self::essence::MilestoneMetadataLength;
 pub use self::{
     essence::MilestoneEssence,
+    index::MilestoneIndex,
     milestone_id::MilestoneId,
     option::{MilestoneOption, MilestoneOptions, PowMilestoneOption, ReceiptMilestoneOption},
 };
@@ -161,7 +163,8 @@ pub mod dto {
     use self::option::dto::MilestoneOptionDto;
     use super::*;
     use crate::{
-        error::dto::DtoError, milestone::MilestoneIndex, parent::Parents, signature::dto::SignatureDto, MessageId,
+        error::dto::DtoError, parent::Parents, payload::milestone::MilestoneIndex, signature::dto::SignatureDto,
+        MessageId,
     };
 
     /// The payload type to define a milestone.

bee-message/src/payload/milestone/option/receipt/mod.rs

@@ -17,9 +17,8 @@ pub(crate) use self::migrated_funds_entry::MigratedFundsAmount;
 pub use self::{migrated_funds_entry::MigratedFundsEntry, tail_transaction_hash::TailTransactionHash};
 use crate::{
     constant::TOKEN_SUPPLY,
-    milestone::MilestoneIndex,
     output::OUTPUT_COUNT_RANGE,
-    payload::{Payload, TreasuryTransactionPayload},
+    payload::{milestone::MilestoneIndex, Payload, TreasuryTransactionPayload},
     Error,
 };
 

bee-message/src/semantic.rs

@@ -9,9 +9,11 @@ use primitive_types::U256;
 use crate::{
     address::Address,
     error::Error,
-    milestone::MilestoneIndex,
     output::{create_inputs_commitment, ChainId, NativeTokens, Output, OutputId, TokenId, UnlockCondition},
-    payload::transaction::{RegularTransactionEssence, TransactionEssence, TransactionId},
+    payload::{
+        milestone::MilestoneIndex,
+        transaction::{RegularTransactionEssence, TransactionEssence, TransactionId},
+    },
     unlock_block::UnlockBlocks,
 };