crypto/txscript/src/wasm -> crypto/txscript/src/bindings/wasm

smartgoo · Nov 16, 2024 · c943255 · c943255
1 parent db7efa6
commit c943255
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 11 deletions.
diff --git a/crypto/txscript/src/bindings/mod.rs b/crypto/txscript/src/bindings/mod.rs
@@ -1,2 +1,7 @@
+pub mod opcodes;
+
 #[cfg(feature = "py-sdk")]
 pub mod python;
+
+#[cfg(any(feature = "wasm32-core", feature = "wasm32-sdk"))]
+pub mod wasm;
diff --git a/crypto/txscript/src/wasm/opcodes.rs → crypto/txscript/src/bindings/opcodes.rs b/crypto/txscript/src/wasm/opcodes.rs → crypto/txscript/src/bindings/opcodes.rs
diff --git a/crypto/txscript/src/bindings/python/builder.rs b/crypto/txscript/src/bindings/python/builder.rs
@@ -1,4 +1,4 @@
-use crate::wasm::opcodes::Opcodes;
+use crate::bindings::opcodes::Opcodes;
 use crate::{script_builder as native, standard};
 use kaspa_consensus_core::tx::ScriptPublicKey;
 use kaspa_python_core::types::PyBinary;

diff --git a/crypto/txscript/src/wasm/builder.rs → crypto/txscript/src/bindings/wasm/builder.rs b/crypto/txscript/src/wasm/builder.rs → crypto/txscript/src/bindings/wasm/builder.rs
diff --git a/crypto/txscript/src/wasm/mod.rs → crypto/txscript/src/bindings/wasm/mod.rs b/crypto/txscript/src/wasm/mod.rs → crypto/txscript/src/bindings/wasm/mod.rs
@@ -6,12 +6,10 @@ use cfg_if::cfg_if;
 
 cfg_if! {
     if #[cfg(any(feature = "wasm32-sdk", feature = "wasm32-core"))] {
-        pub mod opcodes;
+        // pub mod opcodes;
         pub mod builder;
 
-        pub use self::opcodes::*;
+        pub use crate::bindings::opcodes::*;
         pub use self::builder::*;
-    } else if #[cfg(feature = "py-sdk")] {
-        pub mod opcodes;
     }
 }
diff --git a/crypto/txscript/src/lib.rs b/crypto/txscript/src/lib.rs
@@ -1,7 +1,7 @@
 extern crate alloc;
 extern crate core;
 
-#[cfg(feature = "py-sdk")]
+#[cfg(any(feature = "wasm32-sdk", feature = "py-sdk", feature = "py-sdk"))]
 pub mod bindings;
 pub mod caches;
 mod data_stack;
@@ -11,8 +11,6 @@ pub mod result;
 pub mod script_builder;
 pub mod script_class;
 pub mod standard;
-#[cfg(any(feature = "wasm32-sdk", feature = "py-sdk"))]
-pub mod wasm;
 
 use crate::caches::Cache;
 use crate::data_stack::{DataStack, Stack};

diff --git a/python/src/lib.rs b/python/src/lib.rs
@@ -30,7 +30,7 @@ cfg_if::cfg_if! {
             m.add_class::<kaspa_bip32::Mnemonic>()?;
 
             m.add_class::<kaspa_txscript::bindings::python::ScriptBuilder>()?;
-            m.add_class::<kaspa_txscript::wasm::opcodes::Opcodes>()?;
+            m.add_class::<kaspa_txscript::bindings::opcodes::Opcodes>()?;
 
             m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::message::py_sign_message, m)?)?;
             m.add_function(wrap_pyfunction!(kaspa_wallet_core::bindings::python::message::py_verify_message, m)?)?;

diff --git a/wasm/src/lib.rs b/wasm/src/lib.rs
@@ -145,7 +145,7 @@ cfg_if::cfg_if! {
         pub use kaspa_addresses::{Address, Version as AddressVersion};
         pub use kaspa_consensus_core::tx::{ScriptPublicKey, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput};
         pub use kaspa_pow::wasm::*;
-        pub use kaspa_txscript::wasm::*;
+        pub use kaspa_txscript::bindings::wasm::*;
 
         pub mod rpc {
             //! Kaspa RPC interface
@@ -172,7 +172,7 @@ cfg_if::cfg_if! {
         pub use kaspa_addresses::{Address, Version as AddressVersion};
         pub use kaspa_consensus_core::tx::{ScriptPublicKey, Transaction, TransactionInput, TransactionOutpoint, TransactionOutput};
         pub use kaspa_pow::wasm::*;
-        pub use kaspa_txscript::wasm::*;
+        pub use kaspa_txscript::bindings::wasm::*;
 
         pub mod rpc {
             //! Kaspa RPC interface