Skip to content

Commit

Permalink
chore: rearrange protocol-units/da
Browse files Browse the repository at this point in the history
Put the subdirectories under one movement subdirectory
level, to designate these pertain to Movement network.

Also rename movement-da-light-node-grpc
(formerly known as m1-da-light-node-grpc)
to movement-da-light-node-proto.
  • Loading branch information
mzabaluev committed Nov 20, 2024
1 parent 0f2422b commit 23d33dc
Show file tree
Hide file tree
Showing 67 changed files with 42 additions and 42 deletions.
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ members = [
"protocol-units/execution/opt-executor",
"protocol-units/execution/fin-view",
"protocol-units/execution/util",
"protocol-units/da/grpc/light-node",
"protocol-units/da/celestia/*",
"protocol-units/da/movement/protocol/light-node",
"protocol-units/da/movement/celestia/*",
"protocol-units/sequencing/memseq/*",
"protocol-units/mempool/*",
"protocol-units/syncing/*",
Expand Down Expand Up @@ -68,12 +68,12 @@ bridge-indexer-db = { path = "protocol-units/bridge/indexer-db" }
buildtime = { path = "util/buildtime" }
buildtime-helpers = { path = "util/buildtime/buildtime-helpers" }
buildtime-macros = { path = "util/buildtime/buildtime-macros" }
## da/grpc
movement-da-light-node-grpc = { path = "protocol-units/da/grpc/light-node" }
## da/proto
movement-da-light-node-proto = { path = "protocol-units/da/movement/protocol/light-node" }
## da/celestia
movement-celestia-da-util = { path = "protocol-units/da/celestia/util" }
movement-celestia-da-light-node-setup = { path = "protocol-units/da/celestia/setup" }
movement-celestia-da-light-node-verifier = { path = "protocol-units/da/celestia/light-node-verifier" }
movement-celestia-da-util = { path = "protocol-units/da/movement/celestia/util" }
movement-celestia-da-light-node-setup = { path = "protocol-units/da/movement/celestia/setup" }
movement-celestia-da-light-node-verifier = { path = "protocol-units/da/movement/celestia/light-node-verifier" }
## execution
maptos-dof-execution = { path = "protocol-units/execution/dof" }
maptos-opt-executor = { path = "protocol-units/execution/opt-executor" }
Expand Down
2 changes: 1 addition & 1 deletion networks/movement/movement-full-node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rust-version = { workspace = true }
[dependencies]
maptos-dof-execution = { workspace = true }
prost = { workspace = true }
movement-da-light-node-grpc = { workspace = true, features = ["client"] }
movement-da-light-node-proto = { workspace = true, features = ["client"] }
movement-celestia-da-util = { workspace = true }
mcr-settlement-client = { workspace = true, features = ["mock"] }
mcr-settlement-manager = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion networks/movement/movement-full-node/src/partial.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use mcr_settlement_client::McrSettlementClient;
use mcr_settlement_manager::CommitmentEventStream;
use mcr_settlement_manager::McrSettlementManager;
use movement_config::Config;
use movement_da_light_node_grpc::light_node_service_client::LightNodeServiceClient;
use movement_da_light_node_proto::light_node_service_client::LightNodeServiceClient;
use movement_rest::MovementRest;

use anyhow::Context;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use maptos_dof_execution::{
SignatureVerifiedTransaction, SignedTransaction, Transaction,
};
use mcr_settlement_manager::{CommitmentEventStream, McrSettlementManagerOperations};
use movement_da_light_node_grpc::{
use movement_da_light_node_proto::{
blob_response, light_node_service_client::LightNodeServiceClient, StreamReadFromHeightRequest,
StreamReadFromHeightResponse,
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//! Task to process incoming transactions and write to DA
use movement_da_light_node_grpc::{
light_node_service_client::LightNodeServiceClient, BatchWriteRequest, BlobWrite,
};
use maptos_dof_execution::SignedTransaction;
use movement_celestia_da_util::config::Config as LightNodeConfig;
use movement_da_light_node_proto::{
light_node_service_client::LightNodeServiceClient, BatchWriteRequest, BlobWrite,
};

use tokio::sync::mpsc;
use tracing::{info, warn};
Expand Down
2 changes: 1 addition & 1 deletion networks/movement/movement-util/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rust-version = { workspace = true }

[dependencies]
maptos-dof-execution = { workspace = true }
movement-da-light-node-grpc = { workspace = true }
movement-da-light-node-proto = { workspace = true }
movement-celestia-da-util = { workspace = true }
mcr-settlement-client = { workspace = true, features = ["mock"] }
mcr-settlement-manager = { workspace = true }
Expand Down
6 changes: 0 additions & 6 deletions protocol-units/da/celestia/light-node-tests/src/lib.rs

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rust-version = { workspace = true }

[dependencies]
tokio = { workspace = true }
movement-da-light-node-grpc = { workspace = true, features = ["client"] }
movement-da-light-node-proto = { workspace = true, features = ["client"] }
anyhow = { workspace = true }
tokio-stream = { workspace = true }
movement-types = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#![cfg(test)]

pub mod test;

use movement_da_light_node_proto::light_node_service_client::LightNodeServiceClient;
use movement_da_light_node_proto::*;
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tokio = { workspace = true }
tokio-stream = { workspace = true }
tonic = { workspace = true }
prost = { workspace = true }
movement-da-light-node-grpc = { workspace = true, features = [] }
movement-da-light-node-proto = { workspace = true, features = [] }
movement-celestia-da-util = { workspace = true }
celestia-rpc = { workspace = true }
celestia-types = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pub mod celestia;
pub mod permissioned_signers;
pub mod signed;

pub use movement_da_light_node_grpc::*;
pub use movement_da_light_node_proto::*;
use thiserror::Error;

/// Domain error for the transaction pipe task
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::Verifier;
use celestia_rpc::{BlobClient, Client, HeaderClient};
use celestia_types::{nmt::Namespace, Blob};
use movement_da_light_node_grpc::VerificationMode;
use movement_da_light_node_proto::VerificationMode;
use std::sync::Arc;

#[derive(Clone)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ tokio-stream = { workspace = true }
tonic = { workspace = true }
tonic-reflection = { workspace = true }
prost = { workspace = true }
movement-da-light-node-grpc = { workspace = true, features = ["server"] }
movement-da-light-node-proto = { workspace = true, features = ["server"] }
movement-celestia-da-util = { workspace = true }
movement-celestia-da-light-node-verifier = { workspace = true }
movement-algs = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use movement_celestia_da_util::config::Config;
use movement_da_light_node_grpc::light_node_service_server::{
use movement_da_light_node_proto::light_node_service_server::{
LightNodeService, LightNodeServiceServer,
};
use tonic::transport::Server;
Expand All @@ -18,7 +18,7 @@ pub trait LightNodeV1Operations: LightNodeService + Send + Sync + Sized + Clone
/// Runs the server
async fn run_server(&self) -> Result<(), anyhow::Error> {
let reflection = tonic_reflection::server::Builder::configure()
.register_encoded_file_descriptor_set(movement_da_light_node_grpc::FILE_DESCRIPTOR_SET)
.register_encoded_file_descriptor_set(movement_da_light_node_proto::FILE_DESCRIPTOR_SET)
.build_v1()?;

let address = self.try_service_address()?;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ use movement_celestia_da_util::{
config::Config,
ir_blob::{celestia::CelestiaIntermediateBlobRepresentation, InnerSignedBlobV1Data},
};
use movement_da_light_node_grpc::light_node_service_server::LightNodeService;
use movement_da_light_node_grpc::*;
use movement_da_light_node_proto::light_node_service_server::LightNodeService;
use movement_da_light_node_proto::*;

use crate::v1::LightNodeV1Operations;
use ecdsa::{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ use movement_algs::grouping_heuristic::{
splitting::Splitting, GroupingHeuristicStack, GroupingOutcome,
};
use movement_celestia_da_util::config::Config;
use movement_da_light_node_grpc as grpc;
use movement_da_light_node_grpc::blob_response::BlobType;
use movement_da_light_node_grpc::light_node_service_server::LightNodeService;
use movement_da_light_node_proto as grpc;
use movement_da_light_node_proto::blob_response::BlobType;
use movement_da_light_node_proto::light_node_service_server::LightNodeService;
use movement_types::block::Block;

use crate::v1::{passthrough::LightNodeV1 as LightNodeV1PassThrough, LightNodeV1Operations};
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ tokio = { workspace = true }
tokio-stream = { workspace = true }
tonic = { workspace = true }
prost = { workspace = true }
movement-da-light-node-grpc = { workspace = true, features = [] }
movement-da-light-node-proto = { workspace = true, features = [] }
celestia-rpc = { workspace = true }
celestia-types = { workspace = true }
anyhow = { workspace = true }
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "movement-da-light-node-grpc"
name = "movement-da-light-node-proto"
version = { workspace = true }
edition = { workspace = true }
license = { workspace = true }
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub mod v1beta1 {
tonic::include_proto!("movementlabs.protocol_units.da.light_node.v1beta1"); // The string specified here
pub const FILE_DESCRIPTOR_SET: &[u8] =
tonic::include_file_descriptor_set!("movement-da-light-node-grpc-descriptor");
tonic::include_file_descriptor_set!("movement-da-light-node-proto-descriptor");
}

// Re-export the latest version at the crate root
Expand Down

0 comments on commit 23d33dc

Please sign in to comment.