Move transact::protocol::* to protocol::*

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;

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;