From 60aefcaa86fdfcb2868a9e5fd252ea05438d667e Mon Sep 17 00:00:00 2001 From: Christian Poveda <31802960+pvdrz@users.noreply.github.com> Date: Mon, 11 Oct 2021 03:49:57 -0500 Subject: [PATCH] Merge Tangle into MsTangle (`chrysalis-pt-2` branch) (#767) * avoid deref * Update cargo.lock and rename MsTangle to Tangle Co-authored-by: Thibault Martinez --- Cargo.lock | 44 +++++++++---------- bee-api/bee-rest-api/src/endpoints/filters.rs | 6 +-- bee-api/bee-rest-api/src/endpoints/mod.rs | 4 +- .../src/endpoints/routes/api/mod.rs | 4 +- .../endpoints/routes/api/plugins/debug/mod.rs | 4 +- .../routes/api/plugins/debug/white_flag.rs | 6 +-- .../src/endpoints/routes/api/plugins/mod.rs | 4 +- .../src/endpoints/routes/api/v1/info.rs | 6 +-- .../src/endpoints/routes/api/v1/message.rs | 6 +-- .../routes/api/v1/message_children.rs | 6 +-- .../routes/api/v1/message_metadata.rs | 6 +-- .../endpoints/routes/api/v1/message_raw.rs | 6 +-- .../src/endpoints/routes/api/v1/milestone.rs | 6 +-- .../src/endpoints/routes/api/v1/mod.rs | 4 +- .../endpoints/routes/api/v1/submit_message.rs | 10 ++--- .../src/endpoints/routes/api/v1/tips.rs | 6 +-- .../api/v1/transaction_included_message.rs | 6 +-- .../src/endpoints/routes/health.rs | 8 ++-- .../bee-rest-api/src/endpoints/routes/mod.rs | 4 +- bee-node/src/plugins/dashboard/mod.rs | 6 +-- bee-node/src/plugins/dashboard/routes.rs | 6 +-- .../src/plugins/dashboard/websocket/mod.rs | 8 ++-- .../websocket/responses/sync_status.rs | 6 +-- .../plugins/dashboard/workers/node_status.rs | 4 +- bee-protocol/src/workers/heartbeater.rs | 8 ++-- bee-protocol/src/workers/index_updater.rs | 10 ++--- .../src/workers/message/payload/milestone.rs | 6 +-- bee-protocol/src/workers/message/processor.rs | 4 +- bee-protocol/src/workers/peer/manager.rs | 4 +- bee-protocol/src/workers/peer/mod.rs | 6 +-- bee-protocol/src/workers/propagator.rs | 6 +-- bee-protocol/src/workers/requester/message.rs | 8 ++-- .../src/workers/requester/milestone.rs | 12 ++--- bee-protocol/src/workers/responder/message.rs | 4 +- .../src/workers/responder/milestone.rs | 4 +- bee-protocol/src/workers/solidifier.rs | 10 ++--- bee-protocol/src/workers/status.rs | 4 +- 37 files changed, 131 insertions(+), 131 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a8f49eef1..450dc3a9b5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -45,9 +45,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43bb833f0bf979d8475d38fbf09ed3b8a55e1885fe93ad3f93239fc6a4f17b98" +checksum = "991984e3fd003e7ba02eb724f87a0f997b78677c46c0e91f8424ad7394c9886a" dependencies = [ "getrandom 0.2.3", "once_cell", @@ -205,7 +205,7 @@ checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" [[package]] name = "bee-common" version = "0.5.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "autocfg", "chrono", @@ -223,7 +223,7 @@ dependencies = [ [[package]] name = "bee-crypto" version = "0.2.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bee-ternary", "byteorder", @@ -235,7 +235,7 @@ dependencies = [ [[package]] name = "bee-ledger" version = "0.5.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "async-trait", "bee-common", @@ -261,7 +261,7 @@ dependencies = [ [[package]] name = "bee-message" version = "0.1.5" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bech32", "bee-common", @@ -278,7 +278,7 @@ dependencies = [ [[package]] name = "bee-network" version = "0.2.2" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "async-trait", "bee-runtime", @@ -344,7 +344,7 @@ dependencies = [ [[package]] name = "bee-pow" version = "0.1.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bee-crypto", "bee-ternary", @@ -419,7 +419,7 @@ dependencies = [ [[package]] name = "bee-runtime" version = "0.1.1-alpha" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "async-trait", "bee-storage", @@ -432,7 +432,7 @@ dependencies = [ [[package]] name = "bee-storage" version = "0.9.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bee-common", "serde", @@ -442,7 +442,7 @@ dependencies = [ [[package]] name = "bee-storage-rocksdb" version = "0.5.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bee-common", "bee-ledger", @@ -458,7 +458,7 @@ dependencies = [ [[package]] name = "bee-storage-sled" version = "0.4.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "bee-common", "bee-ledger", @@ -474,7 +474,7 @@ dependencies = [ [[package]] name = "bee-tangle" version = "0.2.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "async-trait", "bee-common", @@ -498,7 +498,7 @@ dependencies = [ [[package]] name = "bee-ternary" version = "0.5.0" -source = "git+https://github.com/iotaledger/bee.git?branch=dev#c5d78007500e638c8b0cd7993fd9319da570f0c2" +source = "git+https://github.com/iotaledger/bee.git?branch=dev#57d46f86cdb46cf04b5d88deacc16c87ada23456" dependencies = [ "autocfg", "num-traits", @@ -1611,9 +1611,9 @@ checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" [[package]] name = "libloading" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f84d96438c15fcd6c3f244c8fce01d1e2b9c6b5623e9c711dc9286d8fc92d6a" +checksum = "c0cf036d15402bea3c5d4de17b3fce76b3e4a56ebc1f577be0e7a72f7c607cf0" dependencies = [ "cfg-if", "winapi", @@ -3161,9 +3161,9 @@ dependencies = [ [[package]] name = "synstructure" -version = "0.12.5" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474aaa926faa1603c40b7885a9eaea29b444d1cb2850cb7c0e37bb1a4182f4fa" +checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", @@ -3202,18 +3202,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88" +checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.29" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c" +checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", diff --git a/bee-api/bee-rest-api/src/endpoints/filters.rs b/bee-api/bee-rest-api/src/endpoints/filters.rs index 9c4f45fd2b..90c8a36e24 100644 --- a/bee-api/bee-rest-api/src/endpoints/filters.rs +++ b/bee-api/bee-rest-api/src/endpoints/filters.rs @@ -9,7 +9,7 @@ use bee_protocol::workers::{ config::ProtocolConfig, MessageRequesterWorker, MessageSubmitterWorkerEvent, PeerManager, RequestedMessages, }; use bee_runtime::{event::Bus, node::NodeInfo, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use tokio::sync::mpsc; use warp::Filter; @@ -41,8 +41,8 @@ pub(crate) fn with_protocol_config( } pub(crate) fn with_tangle( - tangle: ResourceHandle>, -) -> impl Filter>,), Error = Infallible> + Clone { + tangle: ResourceHandle>, +) -> impl Filter>,), Error = Infallible> + Clone { warp::any().map(move || tangle.clone()) } diff --git a/bee-api/bee-rest-api/src/endpoints/mod.rs b/bee-api/bee-rest-api/src/endpoints/mod.rs index 998f53a191..397689020e 100644 --- a/bee-api/bee-rest-api/src/endpoints/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/mod.rs @@ -25,7 +25,7 @@ use bee_runtime::{ node::{Node, NodeBuilder}, worker::{Error as WorkerError, Worker}, }; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use log::{error, info}; @@ -77,7 +77,7 @@ where let bech32_hrp = config.3; let consensus_worker = node.worker::().unwrap().tx.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let storage = node.storage(); let message_submitter = node.worker::().unwrap().tx.clone(); let message_requester = node.worker::().unwrap().clone(); diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/mod.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/mod.rs index f5d0b5a18f..63f2f1d41c 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/mod.rs @@ -12,7 +12,7 @@ use bee_protocol::workers::{ config::ProtocolConfig, MessageRequesterWorker, MessageSubmitterWorkerEvent, PeerManager, RequestedMessages, }; use bee_runtime::{event::Bus, node::NodeInfo, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use tokio::sync::mpsc; use warp::{self, Filter, Rejection, Reply}; @@ -27,7 +27,7 @@ pub(crate) fn path() -> impl Filter + Clo pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, storage: ResourceHandle, message_submitter: mpsc::UnboundedSender, network_id: NetworkId, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/mod.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/mod.rs index 8a1ebbcdc5..cc8a9b90fa 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/mod.rs @@ -7,7 +7,7 @@ use crate::endpoints::{config::RestApiConfig, storage::StorageBackend}; use bee_protocol::workers::{MessageRequesterWorker, RequestedMessages}; use bee_runtime::{event::Bus, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{self, Filter, Rejection, Reply}; @@ -22,7 +22,7 @@ pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, bus: ResourceHandle>, message_requester: MessageRequesterWorker, requested_messages: ResourceHandle, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/white_flag.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/white_flag.rs index adf39bc59e..ead5d71abb 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/white_flag.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/debug/white_flag.rs @@ -18,7 +18,7 @@ use bee_ledger::workers::consensus::{self, WhiteFlagMetadata}; use bee_message::{milestone::MilestoneIndex, MessageId}; use bee_protocol::workers::{event::MessageSolidified, request_message, MessageRequesterWorker, RequestedMessages}; use bee_runtime::{event::Bus, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use futures::channel::oneshot; use serde_json::Value as JsonValue; @@ -42,7 +42,7 @@ pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, bus: ResourceHandle>, message_requester: MessageRequesterWorker, requested_messages: ResourceHandle, @@ -64,7 +64,7 @@ pub(crate) fn filter( pub(crate) async fn white_flag( body: JsonValue, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, bus: ResourceHandle>, message_requester: MessageRequesterWorker, requested_messages: ResourceHandle, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/mod.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/mod.rs index c76b9be5bc..f04779246f 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/plugins/mod.rs @@ -7,7 +7,7 @@ use crate::endpoints::{config::RestApiConfig, storage::StorageBackend}; use bee_protocol::workers::{MessageRequesterWorker, RequestedMessages}; use bee_runtime::{event::Bus, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{self, Filter, Rejection, Reply}; @@ -22,7 +22,7 @@ pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, bus: ResourceHandle>, message_requester: MessageRequesterWorker, requested_messages: ResourceHandle, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/info.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/info.rs index 105783a15a..817c335255 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/info.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/info.rs @@ -18,7 +18,7 @@ use crate::{ use bee_protocol::workers::{config::ProtocolConfig, PeerManager}; use bee_runtime::{node::NodeInfo, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{Filter, Rejection, Reply}; @@ -32,7 +32,7 @@ fn path() -> impl Filter + Clone { pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, network_id: NetworkId, bech32_hrp: Bech32Hrp, rest_api_config: RestApiConfig, @@ -54,7 +54,7 @@ pub(crate) fn filter( } pub(crate) async fn info( - tangle: ResourceHandle>, + tangle: ResourceHandle>, network_id: NetworkId, bech32_hrp: Bech32Hrp, rest_api_config: RestApiConfig, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message.rs index f454977ac8..25b9fb1388 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message.rs @@ -11,7 +11,7 @@ use crate::{ use bee_message::MessageId; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{reject, Filter, Rejection, Reply}; @@ -27,7 +27,7 @@ fn path() -> impl Filter + Clone { pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -38,7 +38,7 @@ pub(crate) fn filter( pub(crate) async fn message( message_id: MessageId, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { match tangle.get(&message_id).await.map(|m| (*m).clone()) { Some(message) => Ok(warp::reply::json(&SuccessBody::new(MessageResponse(MessageDto::from( diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_children.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_children.rs index 1ab0483635..a2362b8aad 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_children.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_children.rs @@ -11,7 +11,7 @@ use crate::{ use bee_message::MessageId; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{Filter, Rejection, Reply}; @@ -28,7 +28,7 @@ fn path() -> impl Filter + Clon pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -39,7 +39,7 @@ pub(crate) fn filter( pub async fn message_children( message_id: MessageId, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { let mut children = Vec::from_iter(tangle.get_children(&message_id).await.unwrap_or_default()); let count = children.len(); diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_metadata.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_metadata.rs index 76f7903aa8..bad6673f01 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_metadata.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_metadata.rs @@ -11,7 +11,7 @@ use crate::{ use bee_message::{payload::Payload, MessageId}; use bee_runtime::resource::ResourceHandle; -use bee_tangle::{ConflictReason, MsTangle}; +use bee_tangle::{ConflictReason, Tangle}; use warp::{reject, Filter, Rejection, Reply}; @@ -28,7 +28,7 @@ fn path() -> impl Filter + Clon pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -39,7 +39,7 @@ pub(crate) fn filter( pub(crate) async fn message_metadata( message_id: MessageId, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { if !tangle.is_confirmed_threshold(CONFIRMED_THRESHOLD) { return Err(reject::custom(CustomRejection::ServiceUnavailable( diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_raw.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_raw.rs index b37d3dea49..c3ab113f0c 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_raw.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/message_raw.rs @@ -9,7 +9,7 @@ use crate::endpoints::{ use bee_common::packable::Packable; use bee_message::MessageId; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{http::Response, reject, Filter, Rejection, Reply}; @@ -26,7 +26,7 @@ fn path() -> impl Filter + Clon pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -37,7 +37,7 @@ pub(crate) fn filter( pub async fn message_raw( message_id: MessageId, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { match tangle.get(&message_id).await.map(|m| (*m).clone()) { Some(message) => Ok(Response::builder() diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone.rs index c1a122318d..7ed1bedc4b 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/milestone.rs @@ -11,7 +11,7 @@ use crate::{ use bee_message::milestone::MilestoneIndex; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{reject, Filter, Rejection, Reply}; @@ -27,7 +27,7 @@ fn path() -> impl Filter + Clone pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -38,7 +38,7 @@ pub(crate) fn filter( pub(crate) async fn milestone( milestone_index: MilestoneIndex, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { match tangle.get_milestone_message_id(milestone_index).await { Some(message_id) => match tangle.get_metadata(&message_id).await { diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/mod.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/mod.rs index 1994374bb3..2f1b567c4e 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/mod.rs @@ -31,7 +31,7 @@ use bee_ledger::workers::consensus::ConsensusWorkerCommand; use bee_network::NetworkCommandSender; use bee_protocol::workers::{config::ProtocolConfig, MessageSubmitterWorkerEvent, PeerManager}; use bee_runtime::{node::NodeInfo, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{self, Filter, Rejection, Reply}; @@ -47,7 +47,7 @@ pub(crate) fn path() -> impl Filter + Clo pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, storage: ResourceHandle, message_submitter: mpsc::UnboundedSender, network_id: NetworkId, diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs index 1ce8c2b145..aa32b3ffda 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/submit_message.rs @@ -18,7 +18,7 @@ use bee_message::{parents::Parents, payload::Payload, Message, MessageBuilder, M use bee_pow::providers::{miner::MinerBuilder, NonceProviderBuilder}; use bee_protocol::workers::{config::ProtocolConfig, MessageSubmitterError, MessageSubmitterWorkerEvent}; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use futures::channel::oneshot; use log::error; @@ -35,7 +35,7 @@ fn path() -> impl Filter + Clone { pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, message_submitter: mpsc::UnboundedSender, network_id: NetworkId, rest_api_config: RestApiConfig, @@ -66,7 +66,7 @@ pub(crate) fn filter( pub(crate) async fn submit_message( value: JsonValue, - tangle: ResourceHandle>, + tangle: ResourceHandle>, message_submitter: mpsc::UnboundedSender, network_id: NetworkId, rest_api_config: RestApiConfig, @@ -216,7 +216,7 @@ pub(crate) async fn build_message( pub(crate) async fn submit_message_raw( buf: warp::hyper::body::Bytes, - tangle: ResourceHandle>, + tangle: ResourceHandle>, message_submitter: mpsc::UnboundedSender, ) -> Result { let message = Message::unpack(&mut &(*buf)).map_err(|e| { @@ -236,7 +236,7 @@ pub(crate) async fn submit_message_raw( pub(crate) async fn forward_to_message_submitter( message: Message, - tangle: ResourceHandle>, + tangle: ResourceHandle>, message_submitter: mpsc::UnboundedSender, ) -> Result { let (message_id, message_bytes) = message.id(); diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/tips.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/tips.rs index ded18e9d73..e1dd0fb2ac 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/tips.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/tips.rs @@ -10,7 +10,7 @@ use crate::{ }; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{reject, Filter, Rejection, Reply}; @@ -23,7 +23,7 @@ fn path() -> impl Filter + Clone { pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -32,7 +32,7 @@ pub(crate) fn filter( .and_then(tips) } -pub(crate) async fn tips(tangle: ResourceHandle>) -> Result { +pub(crate) async fn tips(tangle: ResourceHandle>) -> Result { if !tangle.is_confirmed_threshold(CONFIRMED_THRESHOLD) { return Err(reject::custom(CustomRejection::ServiceUnavailable( "the node is not synchronized".to_string(), diff --git a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs index 5fb8ca7a24..849b58b2ea 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/api/v1/transaction_included_message.rs @@ -15,7 +15,7 @@ use bee_ledger::types::CreatedOutput; use bee_message::{output::OutputId, payload::transaction::TransactionId}; use bee_runtime::resource::ResourceHandle; use bee_storage::access::Fetch; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{reject, Filter, Rejection, Reply}; @@ -33,7 +33,7 @@ pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> impl Filter + Clone { self::path() .and(warp::get()) @@ -50,7 +50,7 @@ pub(crate) fn filter( pub(crate) async fn transaction_included_message( transaction_id: TransactionId, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, ) -> Result { // Safe to unwrap since 0 is a valid index; let output_id = OutputId::new(transaction_id, 0).unwrap(); diff --git a/bee-api/bee-rest-api/src/endpoints/routes/health.rs b/bee-api/bee-rest-api/src/endpoints/routes/health.rs index aaa919eb46..e0183ac8a6 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/health.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/health.rs @@ -10,7 +10,7 @@ use crate::endpoints::{ use bee_protocol::workers::PeerManager; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use warp::{http::StatusCode, Filter, Rejection, Reply}; @@ -30,7 +30,7 @@ fn path() -> impl Filter + Clone { pub(crate) fn filter( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, peer_manager: ResourceHandle, ) -> impl Filter + Clone { self::path() @@ -42,7 +42,7 @@ pub(crate) fn filter( } pub(crate) async fn health( - tangle: ResourceHandle>, + tangle: ResourceHandle>, peer_manager: ResourceHandle, ) -> Result { if is_healthy(&tangle, &peer_manager).await { @@ -52,7 +52,7 @@ pub(crate) async fn health( } } -pub async fn is_healthy(tangle: &MsTangle, peer_manager: &PeerManager) -> bool { +pub async fn is_healthy(tangle: &Tangle, peer_manager: &PeerManager) -> bool { if !tangle.is_confirmed_threshold(HEALTH_CONFIRMED_THRESHOLD) { return false; } diff --git a/bee-api/bee-rest-api/src/endpoints/routes/mod.rs b/bee-api/bee-rest-api/src/endpoints/routes/mod.rs index ad11ad52f4..153206529b 100644 --- a/bee-api/bee-rest-api/src/endpoints/routes/mod.rs +++ b/bee-api/bee-rest-api/src/endpoints/routes/mod.rs @@ -12,7 +12,7 @@ use bee_protocol::workers::{ config::ProtocolConfig, MessageRequesterWorker, MessageSubmitterWorkerEvent, PeerManager, RequestedMessages, }; use bee_runtime::{event::Bus, node::NodeInfo, resource::ResourceHandle}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use tokio::sync::mpsc; use warp::{self, Filter, Rejection, Reply}; @@ -23,7 +23,7 @@ use std::net::IpAddr; pub(crate) fn filter_all( public_routes: Box<[String]>, allowed_ips: Box<[IpAddr]>, - tangle: ResourceHandle>, + tangle: ResourceHandle>, storage: ResourceHandle, message_submitter: mpsc::UnboundedSender, network_id: NetworkId, diff --git a/bee-node/src/plugins/dashboard/mod.rs b/bee-node/src/plugins/dashboard/mod.rs index d7a774253b..68e8041435 100644 --- a/bee-node/src/plugins/dashboard/mod.rs +++ b/bee-node/src/plugins/dashboard/mod.rs @@ -32,7 +32,7 @@ use bee_protocol::workers::{ MetricsWorker, PeerManagerResWorker, }; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{event::LatestMilestoneChanged, MsTangle, TangleWorker}; +use bee_tangle::{event::LatestMilestoneChanged, Tangle, TangleWorker}; use async_trait::async_trait; use futures::stream::StreamExt; @@ -58,7 +58,7 @@ where E: Any + Clone + Send + Sync, F: 'static + Fn(E) -> WsEvent + Send + Sync, { - let tangle = node.resource::>(); + let tangle = node.resource::>(); let bus = node.bus(); let users = users.clone(); let (tx, rx) = mpsc::unbounded_channel(); @@ -110,7 +110,7 @@ where // TODO: load them differently if possible let node_config = node.resource::>(); let rest_api_config = node_config.rest_api.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let storage = node.storage(); // Keep track of all connected users, key is usize, value is a websocket sender. diff --git a/bee-node/src/plugins/dashboard/routes.rs b/bee-node/src/plugins/dashboard/routes.rs index b9a3d98c82..d7ec6bc71b 100644 --- a/bee-node/src/plugins/dashboard/routes.rs +++ b/bee-node/src/plugins/dashboard/routes.rs @@ -15,7 +15,7 @@ use crate::{ use bee_common::auth::jwt::JsonWebToken; use bee_rest_api::endpoints::config::RestApiConfig; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use log::debug; use warp::{ @@ -75,7 +75,7 @@ pub(crate) fn page_routes() -> impl Filter( storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, users: WsUsers, node_id: String, auth_config: DashboardAuthConfig, @@ -190,7 +190,7 @@ pub(crate) fn auth_route( pub(crate) fn routes( storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, node_id: String, auth_config: DashboardAuthConfig, rest_api_config: RestApiConfig, diff --git a/bee-node/src/plugins/dashboard/websocket/mod.rs b/bee-node/src/plugins/dashboard/websocket/mod.rs index 3488fcdd1b..53d0d2c8c4 100644 --- a/bee-node/src/plugins/dashboard/websocket/mod.rs +++ b/bee-node/src/plugins/dashboard/websocket/mod.rs @@ -21,7 +21,7 @@ use crate::{ use bee_common::auth::jwt::JsonWebToken; use bee_runtime::{resource::ResourceHandle, shutdown_stream::ShutdownStream}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use futures::{channel::oneshot, FutureExt, StreamExt}; use log::{debug, error}; @@ -67,7 +67,7 @@ pub(crate) type WsUsers = Arc>>; pub(crate) async fn user_connected( ws: WebSocket, storage: ResourceHandle, - tangle: ResourceHandle>, + tangle: ResourceHandle>, users: WsUsers, node_id: String, auth_config: DashboardAuthConfig, @@ -128,7 +128,7 @@ async fn user_message( user_id: usize, msg: Message, users: &WsUsers, - tangle: &MsTangle, + tangle: &Tangle, storage: &B, node_id: &str, auth_config: &DashboardAuthConfig, @@ -199,7 +199,7 @@ async fn user_disconnected(user_id: usize, users: &WsUsers) { users.write().await.remove(&user_id); } -fn send_init_values(topic: &WsTopic, user: &WsUser, tangle: &MsTangle, storage: &B) { +fn send_init_values(topic: &WsTopic, user: &WsUser, tangle: &Tangle, storage: &B) { match topic { WsTopic::SyncStatus => { let event = WsEvent::new( diff --git a/bee-node/src/plugins/dashboard/websocket/responses/sync_status.rs b/bee-node/src/plugins/dashboard/websocket/responses/sync_status.rs index dfa5180e35..8e6cf558a5 100644 --- a/bee-node/src/plugins/dashboard/websocket/responses/sync_status.rs +++ b/bee-node/src/plugins/dashboard/websocket/responses/sync_status.rs @@ -10,7 +10,7 @@ use crate::{ }; use bee_ledger::workers::event::MilestoneConfirmed; -use bee_tangle::{event::LatestMilestoneChanged, MsTangle}; +use bee_tangle::{event::LatestMilestoneChanged, Tangle}; use serde::Serialize; @@ -22,7 +22,7 @@ pub(crate) struct SyncStatusResponse { pub(crate) fn forward_latest_milestone_changed( latest_milestone: LatestMilestoneChanged, - tangle: &MsTangle, + tangle: &Tangle, ) -> WsEvent { WsEvent::new( WsTopic::SyncStatus, @@ -35,7 +35,7 @@ pub(crate) fn forward_latest_milestone_changed( pub(crate) fn forward_confirmed_milestone_changed( event: &MilestoneConfirmed, - tangle: &MsTangle, + tangle: &Tangle, ) -> WsEvent { WsEvent::new( WsTopic::SyncStatus, diff --git a/bee-node/src/plugins/dashboard/workers/node_status.rs b/bee-node/src/plugins/dashboard/workers/node_status.rs index 11a111f1bb..4b647ec239 100644 --- a/bee-node/src/plugins/dashboard/workers/node_status.rs +++ b/bee-node/src/plugins/dashboard/workers/node_status.rs @@ -10,7 +10,7 @@ use crate::{ use bee_protocol::{types::metrics::NodeMetrics, workers::PeerManager}; use bee_rest_api::endpoints::routes::health::is_healthy; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream}; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use futures::StreamExt; use log::debug; @@ -34,7 +34,7 @@ where N: Node, N::Backend: StorageBackend, { - let tangle = node.resource::>(); + let tangle = node.resource::>(); let peer_manager = node.resource::(); let node_config = node.resource::>(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/heartbeater.rs b/bee-protocol/src/workers/heartbeater.rs index 1f79606f45..0ae61877c6 100644 --- a/bee-protocol/src/workers/heartbeater.rs +++ b/bee-protocol/src/workers/heartbeater.rs @@ -11,7 +11,7 @@ use crate::{ use bee_network::PeerId; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::stream::StreamExt; @@ -27,7 +27,7 @@ const CHECK_HEARTBEATS_INTERVAL: u64 = 5; // In seconds. pub(crate) async fn new_heartbeat( peer_manager: &PeerManager, - tangle: &MsTangle, + tangle: &Tangle, ) -> HeartbeatPacket { let connected_peers = peer_manager.connected_peers().await; let synced_peers = peer_manager.synced_peers().await; @@ -53,7 +53,7 @@ pub(crate) async fn send_heartbeat( pub(crate) async fn broadcast_heartbeat( peer_manager: &PeerManager, metrics: &NodeMetrics, - tangle: &MsTangle, + tangle: &Tangle, ) { let heartbeat = new_heartbeat(peer_manager, tangle).await; @@ -85,7 +85,7 @@ where } async fn start(node: &mut N, _config: Self::Config) -> Result { - let tangle = node.resource::>(); + let tangle = node.resource::>(); let peer_manager = node.resource::(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/index_updater.rs b/bee-protocol/src/workers/index_updater.rs index 8408108b03..6f9c9466ec 100644 --- a/bee-protocol/src/workers/index_updater.rs +++ b/bee-protocol/src/workers/index_updater.rs @@ -8,7 +8,7 @@ use bee_message::{ MessageId, }; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{metadata::IndexId, MsTangle, TangleWorker}; +use bee_tangle::{metadata::IndexId, Tangle, TangleWorker}; use async_trait::async_trait; use futures::{future::FutureExt, stream::StreamExt}; @@ -40,7 +40,7 @@ where async fn start(node: &mut N, _config: Self::Config) -> Result { let (tx, rx) = mpsc::unbounded_channel(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); node.spawn::(|shutdown| async move { info!("Running."); @@ -71,7 +71,7 @@ where } } -async fn process(tangle: &MsTangle, milestone: Milestone, index: MilestoneIndex) { +async fn process(tangle: &Tangle, milestone: Milestone, index: MilestoneIndex) { if let Some(parents) = tangle .get(milestone.message_id()) .await @@ -92,7 +92,7 @@ async fn process(tangle: &MsTangle, milestone: Milestone, } async fn update_past_cone( - tangle: &MsTangle, + tangle: &Tangle, mut parents: Vec, index: MilestoneIndex, ) -> HashSet { @@ -146,7 +146,7 @@ async fn update_past_cone( // NOTE: so once a milestone comes in we have to walk the future cones of the root transactions and update their // OMRSI and YMRSI; during that time we need to block the propagator, otherwise it will propagate outdated data. -async fn update_future_cone(tangle: &MsTangle, roots: HashSet) { +async fn update_future_cone(tangle: &Tangle, roots: HashSet) { let mut to_process = roots.into_iter().collect::>(); let mut processed = HashSet::new(); diff --git a/bee-protocol/src/workers/message/payload/milestone.rs b/bee-protocol/src/workers/message/payload/milestone.rs index b599eec7f8..96460a46a6 100644 --- a/bee-protocol/src/workers/message/payload/milestone.rs +++ b/bee-protocol/src/workers/message/payload/milestone.rs @@ -19,7 +19,7 @@ use bee_message::{ Message, MessageId, }; use bee_runtime::{event::Bus, node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{event::LatestMilestoneChanged, MessageRef, MsTangle, TangleWorker}; +use bee_tangle::{event::LatestMilestoneChanged, MessageRef, Tangle, TangleWorker}; use async_trait::async_trait; use futures::{future::FutureExt, stream::StreamExt}; @@ -69,7 +69,7 @@ async fn validate( #[allow(clippy::too_many_arguments)] async fn process( - tangle: &MsTangle, + tangle: &Tangle, message_id: MessageId, message: MessageRef, peer_manager: &PeerManager, @@ -140,7 +140,7 @@ where async fn start(node: &mut N, config: Self::Config) -> Result { let (tx, rx) = mpsc::unbounded_channel(); let milestone_solidifier = node.worker::().unwrap().tx.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_milestones = node.resource::(); let peer_manager = node.resource::(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/message/processor.rs b/bee-protocol/src/workers/message/processor.rs index 5939125280..05e4950cdb 100644 --- a/bee-protocol/src/workers/message/processor.rs +++ b/bee-protocol/src/workers/message/processor.rs @@ -20,7 +20,7 @@ use bee_common::packable::Packable; use bee_message::{Message, MessageId}; use bee_network::PeerId; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{metadata::MessageMetadata, MsTangle, TangleWorker}; +use bee_tangle::{metadata::MessageMetadata, Tangle, TangleWorker}; use async_trait::async_trait; use futures::{channel::oneshot::Sender, stream::StreamExt}; @@ -71,7 +71,7 @@ where let payload_worker = node.worker::().unwrap().tx.clone(); let unreferenced_inserted_worker = node.worker::().unwrap().tx.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_messages = node.resource::(); let metrics = node.resource::(); let peer_manager = node.resource::(); diff --git a/bee-protocol/src/workers/peer/manager.rs b/bee-protocol/src/workers/peer/manager.rs index ff975efb6e..fef0cf6159 100644 --- a/bee-protocol/src/workers/peer/manager.rs +++ b/bee-protocol/src/workers/peer/manager.rs @@ -14,7 +14,7 @@ use crate::{ use bee_network::{Event, NetworkEventReceiver, ServiceHost}; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::{channel::oneshot, StreamExt}; @@ -50,7 +50,7 @@ where async fn start(node: &mut N, config: Self::Config) -> Result { let peer_manager = node.resource::(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_milestones = node.resource::(); let metrics = node.resource::(); let hasher = node.worker::().unwrap().tx.clone(); diff --git a/bee-protocol/src/workers/peer/mod.rs b/bee-protocol/src/workers/peer/mod.rs index 56149227c4..ed0872d4c1 100644 --- a/bee-protocol/src/workers/peer/mod.rs +++ b/bee-protocol/src/workers/peer/mod.rs @@ -25,7 +25,7 @@ use crate::{ use bee_message::milestone::MilestoneIndex; use bee_runtime::resource::ResourceHandle; -use bee_tangle::MsTangle; +use bee_tangle::Tangle; use futures::{channel::oneshot, future::FutureExt}; use log::{debug, error, info, trace}; @@ -76,7 +76,7 @@ impl PeerWorker { pub(crate) async fn run( mut self, - tangle: ResourceHandle>, + tangle: ResourceHandle>, requested_milestones: ResourceHandle, receiver: UnboundedReceiverStream>, shutdown: oneshot::Receiver<()>, @@ -113,7 +113,7 @@ impl PeerWorker { fn process_packet( &mut self, - tangle: &MsTangle, + tangle: &Tangle, header: &HeaderPacket, bytes: &[u8], ) -> Result<(), Error> { diff --git a/bee-protocol/src/workers/propagator.rs b/bee-protocol/src/workers/propagator.rs index 024f2b4d28..cf1b1267a9 100644 --- a/bee-protocol/src/workers/propagator.rs +++ b/bee-protocol/src/workers/propagator.rs @@ -7,7 +7,7 @@ use crate::workers::{ use bee_message::{milestone::MilestoneIndex, MessageId}; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{metadata::IndexId, solid_entry_point::SolidEntryPoint, MsTangle, TangleWorker}; +use bee_tangle::{metadata::IndexId, solid_entry_point::SolidEntryPoint, Tangle, TangleWorker}; use async_trait::async_trait; use futures::{future::FutureExt, stream::StreamExt}; @@ -27,7 +27,7 @@ pub(crate) struct PropagatorWorker { async fn propagate( message_id: MessageId, - tangle: &MsTangle, + tangle: &Tangle, solidified_tx: &async_channel::Sender<(MessageId, Vec, Option)>, ) { let mut children = vec![message_id]; @@ -130,7 +130,7 @@ where let (tx, rx) = mpsc::unbounded_channel(); let milestone_solidifier = node.worker::().unwrap().tx.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let bus = node.bus(); node.spawn::(|shutdown| async move { diff --git a/bee-protocol/src/workers/requester/message.rs b/bee-protocol/src/workers/requester/message.rs index 704cfb90b4..04b821a8a0 100644 --- a/bee-protocol/src/workers/requester/message.rs +++ b/bee-protocol/src/workers/requester/message.rs @@ -11,7 +11,7 @@ use crate::{ use bee_message::{milestone::MilestoneIndex, MessageId}; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_priority_queue::PriorityQueue; use async_trait::async_trait; @@ -33,7 +33,7 @@ use std::{ const RETRY_INTERVAL_MS: u64 = 2500; pub async fn request_message( - tangle: &MsTangle, + tangle: &Tangle, message_requester: &MessageRequesterWorker, requested_messages: &RequestedMessages, message_id: MessageId, @@ -172,7 +172,7 @@ async fn retry_requests( requested_messages: &RequestedMessages, peer_manager: &PeerManager, metrics: &NodeMetrics, - tangle: &MsTangle, + tangle: &Tangle, counter: &mut usize, ) { if peer_manager.is_empty().await { @@ -260,7 +260,7 @@ where } }); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_messages = node.resource::(); let peer_manager = node.resource::(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/requester/milestone.rs b/bee-protocol/src/workers/requester/milestone.rs index 22b3a3347c..47de8d6cb9 100644 --- a/bee-protocol/src/workers/requester/milestone.rs +++ b/bee-protocol/src/workers/requester/milestone.rs @@ -12,7 +12,7 @@ use crate::{ use bee_message::milestone::MilestoneIndex; use bee_network::PeerId; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::StreamExt; @@ -34,7 +34,7 @@ use std::{ const RETRY_INTERVAL_MS: u64 = 2500; pub(crate) async fn request_milestone( - tangle: &MsTangle, + tangle: &Tangle, milestone_requester: &mpsc::UnboundedSender, requested_milestones: &RequestedMilestones, index: MilestoneIndex, @@ -48,7 +48,7 @@ pub(crate) async fn request_milestone( } pub(crate) async fn request_latest_milestone( - tangle: &MsTangle, + tangle: &Tangle, milestone_requester: &mpsc::UnboundedSender, requested_milestones: &RequestedMilestones, to: Option, @@ -159,7 +159,7 @@ async fn retry_requests( requested_milestones: &RequestedMilestones, peer_manager: &PeerManager, metrics: &NodeMetrics, - tangle: &MsTangle, + tangle: &Tangle, counter: &mut usize, ) { if peer_manager.is_empty().await { @@ -217,7 +217,7 @@ where let requested_milestones: RequestedMilestones = Default::default(); node.register_resource(requested_milestones); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_milestones = node.resource::(); let peer_manager = node.resource::(); let metrics = node.resource::(); @@ -246,7 +246,7 @@ where info!("Requester stopped."); }); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_milestones = node.resource::(); let peer_manager = node.resource::(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/responder/message.rs b/bee-protocol/src/workers/responder/message.rs index 4b1fae838c..2ec359c88c 100644 --- a/bee-protocol/src/workers/responder/message.rs +++ b/bee-protocol/src/workers/responder/message.rs @@ -15,7 +15,7 @@ use crate::{ use bee_common::packable::Packable; use bee_network::PeerId; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::stream::StreamExt; @@ -53,7 +53,7 @@ where async fn start(node: &mut N, _config: Self::Config) -> Result { let (tx, rx) = mpsc::unbounded_channel(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let metrics = node.resource::(); let peer_manager = node.resource::(); diff --git a/bee-protocol/src/workers/responder/milestone.rs b/bee-protocol/src/workers/responder/milestone.rs index 88a4893f7b..ba1f8c00f1 100644 --- a/bee-protocol/src/workers/responder/milestone.rs +++ b/bee-protocol/src/workers/responder/milestone.rs @@ -15,7 +15,7 @@ use crate::{ use bee_common::packable::Packable; use bee_network::PeerId; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::stream::StreamExt; @@ -53,7 +53,7 @@ where async fn start(node: &mut N, _config: Self::Config) -> Result { let (tx, rx) = mpsc::unbounded_channel(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let metrics = node.resource::(); let peer_manager = node.resource::(); diff --git a/bee-protocol/src/workers/solidifier.rs b/bee-protocol/src/workers/solidifier.rs index 96a4a182d2..54262eb4fe 100644 --- a/bee-protocol/src/workers/solidifier.rs +++ b/bee-protocol/src/workers/solidifier.rs @@ -19,7 +19,7 @@ use bee_message::{ MessageId, }; use bee_runtime::{event::Bus, node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{event::SolidMilestoneChanged, traversal, MsTangle, TangleWorker}; +use bee_tangle::{event::SolidMilestoneChanged, traversal, Tangle, TangleWorker}; use async_trait::async_trait; use futures::StreamExt; @@ -36,7 +36,7 @@ pub(crate) struct MilestoneSolidifierWorker { } async fn heavy_solidification( - tangle: &MsTangle, + tangle: &Tangle, message_requester: &MessageRequesterWorker, requested_messages: &RequestedMessages, target_index: MilestoneIndex, @@ -46,7 +46,7 @@ async fn heavy_solidification( let mut missing = Vec::new(); traversal::visit_parents_depth_first( - &**tangle, + tangle, target_id, |id, _, metadata| async move { !metadata.flags().is_solid() && !requested_messages.contains(&id).await }, |_, _, _| {}, @@ -66,7 +66,7 @@ async fn heavy_solidification( #[allow(clippy::too_many_arguments)] async fn solidify( - tangle: &MsTangle, + tangle: &Tangle, consensus_worker: &mpsc::UnboundedSender, index_updater_worker: &mpsc::UnboundedSender, peer_manager: &PeerManager, @@ -126,7 +126,7 @@ where let milestone_requester = node.worker::().unwrap().tx.clone(); let consensus_worker = node.worker::().unwrap().tx.clone(); let milestone_cone_updater = node.worker::().unwrap().tx.clone(); - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_messages = node.resource::(); let requested_milestones = node.resource::(); let metrics = node.resource::(); diff --git a/bee-protocol/src/workers/status.rs b/bee-protocol/src/workers/status.rs index b254804d58..2a8ee58f00 100644 --- a/bee-protocol/src/workers/status.rs +++ b/bee-protocol/src/workers/status.rs @@ -5,7 +5,7 @@ use crate::workers::{storage::StorageBackend, MessageRequesterWorker, RequestedM use bee_ledger::workers::consensus::ConsensusWorker; use bee_runtime::{node::Node, shutdown_stream::ShutdownStream, worker::Worker}; -use bee_tangle::{MsTangle, TangleWorker}; +use bee_tangle::{Tangle, TangleWorker}; use async_trait::async_trait; use futures::StreamExt; @@ -36,7 +36,7 @@ where } async fn start(node: &mut N, config: Self::Config) -> Result { - let tangle = node.resource::>(); + let tangle = node.resource::>(); let requested_messages = node.resource::(); node.spawn::(|shutdown| async move {