Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.92.0
toolchain: 1.95.0
- if: matrix.os == 'windows-latest'
name: Windows Dependencies
shell: pwsh
Expand All @@ -44,7 +44,7 @@ jobs:
- uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.92.0
toolchain: 1.95.0
- name: Integration_Test
run: make integration

Expand All @@ -57,7 +57,7 @@ jobs:
- uses: actions/checkout@v2
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.92.0
toolchain: 1.95.0
- name: Linters
run: |
cargo fmt --version || rustup component add rustfmt
Expand All @@ -78,7 +78,7 @@ jobs:
- uses: actions/checkout@v3
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.92.0
toolchain: 1.95.0
- name: cargo-deny
uses: EmbarkStudios/cargo-deny-action@v2
with:
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

2 changes: 2 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "1.95.0"
Comment on lines +1 to +2
2 changes: 1 addition & 1 deletion src/subcommands/tx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ impl CliSubCommand for TxSubCommand<'_> {
}

let mut output_total = 0;
for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data().into_iter()) {
for (output, data) in tx.outputs().into_iter().zip(tx.outputs_data()) {
let capacity: u64 = output.capacity().unpack();
output_total += capacity;
let data_len = data.raw_data().len();
Expand Down
6 changes: 1 addition & 5 deletions src/subcommands/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -863,11 +863,7 @@ fn search_path(
let key_set = plugin_mgr
.keystore_handler()
.derived_key_set_by_index(hash160, 0, 2000, 0, 2000, password)?;
for (path, hash) in key_set
.external
.into_iter()
.chain(key_set.change.into_iter())
{
for (path, hash) in key_set.external.into_iter().chain(key_set.change) {
if hash == target {
return Ok(path);
}
Expand Down
6 changes: 1 addition & 5 deletions src/subcommands/wallet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,7 @@ impl<'a> WalletSubCommand<'a> {
None,
)?;
let mut change_path_opt = None;
for (path, hash160) in key_set
.external
.into_iter()
.chain(key_set.change.into_iter())
{
for (path, hash160) in key_set.external.into_iter().chain(key_set.change) {
if hash160 == change_last {
change_path_opt = Some(path.clone());
}
Expand Down
Loading