Merge pull request #265 from RGB-WG/movearound

Re-order modules and re-name data types
RGB-WG · Aug 9, 2024 · 8af3baf · 8af3baf
2 parents e24c3d9 + a71b1e7
commit 8af3baf
Show file tree

Hide file tree

Showing 31 changed files with 940 additions and 906 deletions.
diff --git a/src/contract/seal.rs b/src/contract/seal.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -44,7 +44,7 @@ extern crate commit_verify;
 extern crate serde_crate as serde;
 extern crate core;
 
-mod contract;
+mod operation;
 pub mod schema;
 pub mod validation;
 #[macro_use]
@@ -54,8 +54,9 @@ pub mod stl;
 
 pub mod prelude {
     pub use commit_verify::ReservedBytes;
-    pub use contract::*;
+    pub use operation::*;
     pub use schema::*;
+    pub use vm::XWitnessId;
 
     #[cfg(feature = "stl")]
     pub use super::stl;

diff --git a/src/contract/assignments.rs → src/operation/assignments.rs b/src/contract/assignments.rs → src/operation/assignments.rs
@@ -30,7 +30,7 @@ use commit_verify::{Conceal, ReservedBytes};
 use strict_encoding::{StrictDumb, StrictEncode};
 
 use super::ExposedState;
-use crate::contract::seal::GenesisSeal;
+use crate::operation::seal::GenesisSeal;
 use crate::{
     AssignmentType, ExposedSeal, GraphSeal, RevealedAttach, RevealedData, RevealedValue,
     SecretSeal, StateType, VoidState, XChain, LIB_NAME_RGB_COMMIT,

diff --git a/src/contract/attachment.rs → src/operation/attachment.rs b/src/contract/attachment.rs → src/operation/attachment.rs
diff --git a/src/contract/bundle.rs → src/operation/bundle.rs b/src/contract/bundle.rs → src/operation/bundle.rs
diff --git a/src/contract/commit.rs → src/operation/commit.rs b/src/contract/commit.rs → src/operation/commit.rs
diff --git a/src/contract/data.rs → src/operation/data.rs b/src/contract/data.rs → src/operation/data.rs
diff --git a/src/contract/fungible.rs → src/operation/fungible.rs b/src/contract/fungible.rs → src/operation/fungible.rs
diff --git a/src/contract/global.rs → src/operation/global.rs b/src/contract/global.rs → src/operation/global.rs
diff --git a/src/contract/meta.rs → src/operation/meta.rs b/src/contract/meta.rs → src/operation/meta.rs
diff --git a/src/contract/mod.rs → src/operation/mod.rs b/src/contract/mod.rs → src/operation/mod.rs
@@ -51,12 +51,12 @@ pub use fungible::{
 pub use global::{GlobalState, GlobalValues};
 pub use meta::{MetaValue, Metadata, MetadataError};
 pub use operations::{
-    AssetTags, Extension, Genesis, Identity, Input, Inputs, OpRef, Operation, Opout,
-    OpoutParseError, Redeemed, Transition, Valencies,
+    AssetTags, Extension, Genesis, Identity, Input, Inputs, Operation, Opout, OpoutParseError,
+    Redeemed, Transition, Valencies,
 };
 pub use seal::{
-    ExposedSeal, GenesisSeal, GraphSeal, OutputSeal, SecretSeal, TxoSeal, WitnessOrd, WitnessPos,
-    XGenesisSeal, XGraphSeal, XOutputSeal, XWitnessId, XWitnessTx,
+    ExposedSeal, GenesisSeal, GraphSeal, OutputSeal, SecretSeal, TxoSeal, XGenesisSeal, XGraphSeal,
+    XOutputSeal,
 };
 pub use state::{ConcealedState, ConfidentialState, ExposedState, RevealedState, StateType};
 pub use xchain::{