Merge Tangle into MsTangle (chrysalis-pt-2 branch) (#767)

* avoid deref * Update cargo.lock and rename MsTangle to Tangle Co-authored-by: Thibault Martinez <thibault@iota.org>
iotaledger · Oct 11, 2021 · 60aefca · 60aefca
1 parent a448821
commit 60aefca
Show file tree

Hide file tree

Showing 37 changed files with 131 additions and 131 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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<B: StorageBackend>(
- tangle: ResourceHandle<MsTangle<B>>,
-) -> impl Filter<Extract = (ResourceHandle<MsTangle<B>>,), Error = Infallible> + Clone {
+ tangle: ResourceHandle<Tangle<B>>,
+) -> impl Filter<Extract = (ResourceHandle<Tangle<B>>,), 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
@@ -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::<ConsensusWorker>().unwrap().tx.clone();
- let tangle = node.resource::<MsTangle<N::Backend>>();
+ let tangle = node.resource::<Tangle<N::Backend>>();
  let storage = node.storage();
  let message_submitter = node.worker::<MessageSubmitterWorker>().unwrap().tx.clone();
  let message_requester = node.worker::<MessageRequesterWorker>().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
@@ -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<Extract = (), Error = warp::Rejection> + Clo
 pub(crate) fn filter<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  storage: ResourceHandle<B>,
  message_submitter: mpsc::UnboundedSender<MessageSubmitterWorkerEvent>,
  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
@@ -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<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
  storage: ResourceHandle<B>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  bus: ResourceHandle<Bus<'static>>,
  message_requester: MessageRequesterWorker,
  requested_messages: ResourceHandle<RequestedMessages>,

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
@@ -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<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
  storage: ResourceHandle<B>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  bus: ResourceHandle<Bus<'static>>,
  message_requester: MessageRequesterWorker,
  requested_messages: ResourceHandle<RequestedMessages>,
@@ -64,7 +64,7 @@ pub(crate) fn filter<B: StorageBackend>(
 pub(crate) async fn white_flag<B: StorageBackend>(
  body: JsonValue,
  storage: ResourceHandle<B>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  bus: ResourceHandle<Bus<'static>>,
  message_requester: MessageRequesterWorker,
  requested_messages: ResourceHandle<RequestedMessages>,

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
@@ -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<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
  storage: ResourceHandle<B>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  bus: ResourceHandle<Bus<'static>>,
  message_requester: MessageRequesterWorker,
  requested_messages: ResourceHandle<RequestedMessages>,

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
@@ -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<Extract = (), Error = warp::Rejection> + Clone {
 pub(crate) fn filter<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  network_id: NetworkId,
  bech32_hrp: Bech32Hrp,
  rest_api_config: RestApiConfig,
@@ -54,7 +54,7 @@ pub(crate) fn filter<B: StorageBackend>(
 }
 
 pub(crate) async fn info<B: StorageBackend>(
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
  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
@@ -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<Extract = (MessageId,), Error = Rejection> + Clone {
 pub(crate) fn filter<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
  self::path()
  .and(warp::get())
@@ -38,7 +38,7 @@ pub(crate) fn filter<B: StorageBackend>(
 
 pub(crate) async fn message<B: StorageBackend>(
  message_id: MessageId,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> Result<impl Reply, Rejection> {
  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
@@ -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<Extract = (MessageId,), Error = warp::Rejection> + Clon
 pub(crate) fn filter<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
  self::path()
  .and(warp::get())
@@ -39,7 +39,7 @@ pub(crate) fn filter<B: StorageBackend>(
 
 pub async fn message_children<B: StorageBackend>(
  message_id: MessageId,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> Result<impl Reply, Rejection> {
  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
@@ -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<Extract = (MessageId,), Error = warp::Rejection> + Clon
 pub(crate) fn filter<B: StorageBackend>(
  public_routes: Box<[String]>,
  allowed_ips: Box<[IpAddr]>,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> impl Filter<Extract = impl Reply, Error = Rejection> + Clone {
  self::path()
  .and(warp::get())
@@ -39,7 +39,7 @@ pub(crate) fn filter<B: StorageBackend>(
 
 pub(crate) async fn message_metadata<B: StorageBackend>(
  message_id: MessageId,
- tangle: ResourceHandle<MsTangle<B>>,
+ tangle: ResourceHandle<Tangle<B>>,
 ) -> Result<impl Reply, Rejection> {
  if !tangle.is_confirmed_threshold(CONFIRMED_THRESHOLD) {
  return Err(reject::custom(CustomRejection::ServiceUnavailable(