Skip to content

Commit 4cba8a0

Browse files
committed
Merge branch 'main' into ec2/serialization
2 parents 3986103 + 93c0569 commit 4cba8a0

File tree

6 files changed

+519
-41
lines changed

6 files changed

+519
-41
lines changed

.github/workflows/web-tests.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
name: Web Tests
1+
# name: Web Tests
22

3-
on:
4-
pull_request:
5-
push:
6-
branches: main
3+
# on:
4+
# pull_request:
5+
# push:
6+
# branches: main
77

8-
jobs:
9-
wasm-pack-test:
10-
runs-on: ubuntu-latest
11-
steps:
12-
- name: Checkout
13-
uses: actions/checkout@v3
8+
# jobs:
9+
# wasm-pack-test:
10+
# runs-on: ubuntu-latest
11+
# steps:
12+
# - name: Checkout
13+
# uses: actions/checkout@v3
1414

15-
- name: install wasm-pack
16-
uses: jetli/wasm-pack-action@v0.4.0
17-
with:
18-
version: latest
15+
# - name: install wasm-pack
16+
# uses: jetli/wasm-pack-action@v0.4.0
17+
# with:
18+
# version: latest
1919

20-
- name: Install Just
21-
uses: extractions/setup-just@v2
20+
# - name: Install Just
21+
# uses: extractions/setup-just@v2
2222

23-
- name: Run tests
24-
run: just test-web
23+
# - name: Run tests
24+
# run: just test-web

Cargo.lock

Lines changed: 0 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,9 @@ codegen-units = 1
1919
[package.metadata.wasm-pack.profile.release]
2020
wasm-opt = ["-O4", "-O4"]
2121

22-
23-
2422
[features]
2523
default = ["console_error_panic_hook"]
2624
console_error_panic_hook = ["dep:console_error_panic_hook"]
27-
# native = ["tokio"]
2825

2926
[dependencies]
3027
## Web dependencies
@@ -63,7 +60,6 @@ tracing = "0.1.40"
6360
nonempty = "0.7"
6461
hex = "0.4.3"
6562
postcard = { version = "1.0.10", features = ["alloc"] }
66-
tokio = { version = "1.0", features = ["rt", "macros"], optional = true }
6763
serde = { version = "1", features = ["derive"], default-features = false }
6864

6965
[dev-dependencies]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![GitHub License](https://img.shields.io/github/license/ChainSafe/WebZjs)
44

5-
A performant javascript client library for building Zcash browser wallets
5+
A javascript client library for building Zcash browser wallets
66

77
## Overview
88

src/bindgen/wallet.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use std::collections::HashMap;
22
use std::num::NonZeroU32;
33

44
use nonempty::NonEmpty;
5-
use sha2::digest::block_buffer::Block;
65
use wasm_bindgen::prelude::*;
76

87
use bip0039::{English, Mnemonic};
@@ -94,7 +93,7 @@ impl Wallet {
9493
db: MemoryWalletDb::new(network, PRUNING_DEPTH),
9594
client: CompactTxStreamerClient::new(Client::new(lightwalletd_url.to_string())),
9695
network,
97-
min_confirmations: min_confirmations,
96+
min_confirmations,
9897
})
9998
}
10099

@@ -412,8 +411,7 @@ impl Wallet {
412411
Err(Error::SendFailed {
413412
code: response.error_code,
414413
reason: response.error_message,
415-
}
416-
.into())
414+
})
417415
} else {
418416
tracing::info!("Transaction {} send successfully :)", txid);
419417
Ok(())

0 commit comments

Comments
 (0)