Move sequencer protos into astria-proto

astriaorg · May 17, 2023 · 3fa1e88 · 3fa1e88
1 parent b0f01bf
commit 3fa1e88
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 161 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,6 +7,5 @@ members = [
   "crates/astria-proto",
   "crates/astria-rs-cnc",
   "crates/astria-sequencer-relayer",
-  "crates/astria-sequencer-relayer-proto",
   "crates/astria-sequencer-relayer-test",
 ]
diff --git a/crates/astria-conductor/Cargo.toml b/crates/astria-conductor/Cargo.toml
@@ -29,7 +29,6 @@ astria-proto = { path = "../astria-proto" }
 astria-gossipnet = { path = "../astria-gossipnet" }
 astria-rs-cnc = { path = "../astria-rs-cnc", default-features = false, features = ["rustls"] }
 astria-sequencer-relayer = { path = "../astria-sequencer-relayer" }
-astria-sequencer-relayer-proto = { path = "../astria-sequencer-relayer-proto" }
 
 [dev-dependencies]
 astria-conductor-test = { path = "../astria-conductor-test" }
diff --git a/crates/astria-conductor/src/executor.rs b/crates/astria-conductor/src/executor.rs
@@ -10,7 +10,7 @@ use astria_sequencer_relayer::{
         SequencerBlock,
     },
 };
-use astria_sequencer_relayer_proto::SequencerMsg;
+use astria_proto::sequencer::SequencerMsg;
 use color_eyre::eyre::{
     Result,
     WrapErr as _,

diff --git a/crates/astria-proto/src/lib.rs b/crates/astria-proto/src/lib.rs
@@ -1,3 +1,7 @@
 pub mod execution {
     include!(concat!(env!("OUT_DIR"), "/astria.execution.v1.rs"));
 }
+
+pub mod sequencer {
+    include!(concat!(env!("OUT_DIR"), "/astria.sequencer.v1.rs"));
+}
diff --git a/crates/astria-sequencer-relayer-proto/Cargo.toml b/crates/astria-sequencer-relayer-proto/Cargo.toml
diff --git a/crates/astria-sequencer-relayer-proto/build.rs b/crates/astria-sequencer-relayer-proto/build.rs
diff --git a/crates/astria-sequencer-relayer-proto/proto/msg.proto b/crates/astria-sequencer-relayer-proto/proto/msg.proto
diff --git a/crates/astria-sequencer-relayer-proto/proto/tx.proto b/crates/astria-sequencer-relayer-proto/proto/tx.proto
diff --git a/crates/astria-sequencer-relayer-proto/src/lib.rs b/crates/astria-sequencer-relayer-proto/src/lib.rs
diff --git a/crates/astria-sequencer-relayer/Cargo.toml b/crates/astria-sequencer-relayer/Cargo.toml
@@ -28,7 +28,7 @@ http = "0.2.9"
 tokio = { version = "1.24", features = [ "macros", "rt-multi-thread" ] }
 
 astria-gossipnet = { path = "../astria-gossipnet", features = [ "mdns" ] }
-astria-sequencer-relayer-proto = { path = "../astria-sequencer-relayer-proto" }
+astria-proto = { path = "../astria-proto" }
 astria-rs-cnc = { path = "../astria-rs-cnc", default-features = false, features = ["rustls"] }
 
 [dev-dependencies]

diff --git a/crates/astria-sequencer-relayer/src/sequencer_block.rs b/crates/astria-sequencer-relayer/src/sequencer_block.rs
@@ -3,7 +3,7 @@ use std::{
     fmt,
 };
 
-use astria_sequencer_relayer_proto::{
+use astria_proto::sequencer::{
     SequencerMsg,
     TxBody,
     TxRaw,