tests passing with split packages

Author: willemolding

Cargo.lock

@@ -1,10 +1,17 @@
 [workspace]
+resolver = "2"
 
 members = [ "crates/webz-common",
-    "crates/webz-keys",
+    "crates/webz-keys", "crates/webz-requests",
     "crates/webz-wallet",
 ]
 
+[profile.release]
+# Tell `rustc` to optimize for small code size.
+opt-level = 3
+lto = true
+codegen-units = 1
+
 [workspace.dependencies]
 ## Web dependencies
 wasm-bindgen = "0.2.93"

Cargo.toml

@@ -6,7 +6,6 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/ChainSafe/WebZjs"
 description = "A browser client-side library for generating and manipulating zcash keys"
 edition = "2021"
-resolver = "2"
 
 [dependencies]
 serde.workspace = true

crates/webz-common/Cargo.toml

@@ -6,17 +6,10 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/ChainSafe/WebZjs"
 description = "A browser client-side library for generating and manipulating zcash keys"
 edition = "2021"
-resolver = "2"
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = 3
-lto = true
-codegen-units = 1
-
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ["-O4", "-O4"]
 

crates/webz-keys/Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "webz-requests"
+version = "0.1.0"
+authors = ["ChainSafe Systems"]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/ChainSafe/WebZjs"
+description = "A browser client-side library for generating and manipulating zcash keys"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = ["-O4", "-O4"]
+
+[dependencies]
+wasm-bindgen.workspace = true
+js-sys.workspace = true
+
+zcash_address.workspace = true
+zcash_primitives.workspace = true
+zip321.workspace = true
+thiserror.workspace = true
+serde-wasm-bindgen.workspace = true
+
+# fixes "failed to resolve: use of undeclared crate or module `imp`" error
+getrandom = { version = "0.2", features = ["js"] }

crates/webz-requests/Cargo.toml

@@ -0,0 +1,23 @@
+use wasm_bindgen::JsValue;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Error parsing zatoshi amount: {0}")]
+    InvalidAmount(#[from] zcash_primitives::transaction::components::amount::BalanceError),
+    #[error("Attempted to create a transaction with a memo to an unsupported recipient. Only shielded addresses are supported.")]
+    UnsupportedMemoRecipient,
+    #[error("Error constructing ZIP321 transaction request: {0}")]
+    Zip321(#[from] zip321::Zip321Error),
+    #[error("Error decoding memo: {0}")]
+    MemoDecoding(#[from] zcash_primitives::memo::Error),
+    #[error("Error attempting to decode address: {0}")]
+    AddressDecoding(#[from] zcash_address::ParseError),
+    #[error("serde wasm-bindgen error")]
+    SerdeWasmBindgen(#[from] serde_wasm_bindgen::Error),
+}
+
+impl From<Error> for JsValue {
+    fn from(e: Error) -> Self {
+        js_sys::Error::new(&e.to_string()).into()
+    }
+}

crates/webz-requests/src/error.rs

@@ -0,0 +1,2 @@
+mod error;
+mod requests;

crates/webz-requests/src/lib.rs

@@ -6,18 +6,10 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/ChainSafe/WebZjs"
 description = "A browser client-side library for implementing Zcash wallets"
 edition = "2021"
-resolver = "2"
-
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-# Tell `rustc` to optimize for small code size.
-opt-level = 3
-lto = true
-codegen-units = 1
-
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ["-O4", "-O4"]
 

crates/webz-wallet/src/bindgen/tx_requests.rs renamed to crates/webz-requests/src/requests.rs

@@ -1,3 +1,2 @@
 pub mod proposal;
-pub mod tx_requests;
 pub mod wallet;