Include versions

astriaorg · May 19, 2023 · a1888d0 · a1888d0
1 parent 5cd0c46
commit a1888d0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/.github/workflows/proto.yml b/.github/workflows/proto.yml
@@ -16,7 +16,7 @@ jobs:
           github_token: ${{ github.token }}
       - uses: bufbuild/buf-lint-action@v1
         with:
-          input: "crates/astria-proto/proto"
+          input: "crates/astria-proto"
       # TODO(GH-3): Uncomment out after reaching any production stage
       # - uses: bufbuild/buf-breaking-action@v1
       #   with:
@@ -26,5 +26,5 @@ jobs:
       - uses: bufbuild/buf-push-action@v1
         with:
           draft:  ${{ github.ref_name != 'main'}}
-          input: "crates/astria-proto"
+          input: "crates/astria-proto/proto"
           buf_token: ${{ secrets.BUF_TOKEN }}
diff --git a/crates/astria-conductor/src/execution_client.rs b/crates/astria-conductor/src/execution_client.rs
@@ -1,4 +1,4 @@
-use astria_proto::execution::{
+use astria_proto::execution::v1::{
     execution_service_client::ExecutionServiceClient,
     DoBlockRequest,
     DoBlockResponse,

diff --git a/crates/astria-conductor/src/executor.rs b/crates/astria-conductor/src/executor.rs
@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use astria_proto::sequencer::SequencerMsg;
+use astria_proto::sequencer::v1::SequencerMsg;
 use astria_sequencer_relayer::{
     base64_string::Base64String,
     sequencer_block::{

diff --git a/crates/astria-proto/buf.lock → crates/astria-proto/proto/buf.lock b/crates/astria-proto/buf.lock → crates/astria-proto/proto/buf.lock
diff --git a/crates/astria-proto/buf.yaml → crates/astria-proto/proto/buf.yaml b/crates/astria-proto/buf.yaml → crates/astria-proto/proto/buf.yaml
diff --git a/crates/astria-proto/src/lib.rs b/crates/astria-proto/src/lib.rs
@@ -1,7 +1,12 @@
 pub mod execution {
-    include!(concat!(env!("OUT_DIR"), "/astria.execution.v1.rs"));
+    pub mod v1 {
+        include!(concat!(env!("OUT_DIR"), "/astria.execution.v1.rs"));
+    }
+
 }
 
 pub mod sequencer {
-    include!(concat!(env!("OUT_DIR"), "/astria.sequencer.v1.rs"));
+    pub mod v1 {
+        include!(concat!(env!("OUT_DIR"), "/astria.sequencer.v1.rs"));
+    }
 }
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_proto::sequencer::{
+use astria_proto::sequencer::v1::{
     SequencerMsg,
     TxBody,
     TxRaw,