Merge pull request #174 from vaporos/016-move-protocol-structs

Move transact::protocol::* to protocol::*
hyperledger-archives · Aug 10, 2023 · fdc5073 · fdc5073
2 parents a8b582e + c272af8
commit fdc5073
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 6 deletions.
diff --git a/libsawtooth/src/transact/protocol/batch.rs → libsawtooth/src/protocol/batch.rs b/libsawtooth/src/transact/protocol/batch.rs → libsawtooth/src/protocol/batch.rs
diff --git a/libsawtooth/src/transact/protocol/command.rs → libsawtooth/src/protocol/command.rs b/libsawtooth/src/transact/protocol/command.rs → libsawtooth/src/protocol/command.rs
diff --git a/.../src/transact/protocol/key_value_state.rs → libsawtooth/src/protocol/key_value_state.rs b/.../src/transact/protocol/key_value_state.rs → libsawtooth/src/protocol/key_value_state.rs
diff --git a/libsawtooth/src/protocol/mod.rs b/libsawtooth/src/protocol/mod.rs
@@ -17,13 +17,24 @@
 
 //! Structs that cover the core protocols of the Sawtooth system.
 
+#[cfg(feature = "transact-protocol-batch")]
+pub mod batch;
 #[cfg(feature = "protocol-block")]
 pub mod block;
 pub mod block_info;
+pub mod command;
 #[cfg(feature = "protocol-genesis")]
 pub mod genesis;
 pub mod identity;
+#[cfg(feature = "transact-key-value-state")]
+pub mod key_value_state;
+#[cfg(feature = "transact")]
+pub mod receipt;
+#[cfg(any(feature = "transact-protocol-sabre", feature = "family-sabre"))]
+pub mod sabre;
 pub mod setting;
+#[cfg(feature = "transact-protocol-transaction")]
+pub mod transaction;
 
 #[cfg(feature = "cylinder")]
 use cylinder::SigningError;

diff --git a/libsawtooth/src/transact/protocol/receipt.rs → libsawtooth/src/protocol/receipt.rs b/libsawtooth/src/transact/protocol/receipt.rs → libsawtooth/src/protocol/receipt.rs
diff --git a/...wtooth/src/transact/protocol/sabre/mod.rs → libsawtooth/src/protocol/sabre/mod.rs b/...wtooth/src/transact/protocol/sabre/mod.rs → libsawtooth/src/protocol/sabre/mod.rs
diff --git a/...th/src/transact/protocol/sabre/payload.rs → libsawtooth/src/protocol/sabre/payload.rs b/...th/src/transact/protocol/sabre/payload.rs → libsawtooth/src/protocol/sabre/payload.rs
diff --git a/...ooth/src/transact/protocol/sabre/state.rs → libsawtooth/src/protocol/sabre/state.rs b/...ooth/src/transact/protocol/sabre/state.rs → libsawtooth/src/protocol/sabre/state.rs
diff --git a/...ooth/src/transact/protocol/transaction.rs → libsawtooth/src/protocol/transaction.rs b/...ooth/src/transact/protocol/transaction.rs → libsawtooth/src/protocol/transaction.rs
diff --git a/libsawtooth/src/transact/protocol/mod.rs b/libsawtooth/src/transact/protocol/mod.rs
@@ -21,12 +21,12 @@
 //! scheduled and executed.  The resuls of execution are stored in transaction receipts.
 
 #[cfg(feature = "transact-protocol-batch")]
-pub mod batch;
-pub mod command;
+pub use crate::protocol::batch;
+pub use crate::protocol::command;
 #[cfg(feature = "transact-key-value-state")]
-pub mod key_value_state;
-pub mod receipt;
+pub use crate::protocol::key_value_state;
+pub use crate::protocol::receipt;
 #[cfg(any(feature = "transact-protocol-sabre", feature = "family-sabre"))]
-pub mod sabre;
+pub use crate::protocol::sabre;
 #[cfg(feature = "transact-protocol-transaction")]
-pub mod transaction;
+pub use crate::protocol::transaction;