Skip to content

Commit 7d13b38

Browse files
committed
Merge remote-tracking branch 'benma/revert'
2 parents 96ea9e1 + 5d89892 commit 7d13b38

File tree

4 files changed

+294
-269
lines changed

4 files changed

+294
-269
lines changed

src/rust/bitbox02-rust/src/hww/api/bitcoin.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,7 @@ async fn address_policy(
239239
keypath::validate_address_policy(keypath, keypath::ReceiveSpend::Receive)
240240
.or(Err(Error::InvalidInput))?;
241241

242-
let parsed = policies::parse(policy)?;
243-
parsed.validate(coin)?;
242+
let parsed = policies::parse(policy, coin)?;
244243

245244
let name = match policies::get_name(coin, policy)? {
246245
Some(name) => name,
@@ -250,7 +249,9 @@ async fn address_policy(
250249
let title = "Receive to";
251250

252251
if display {
253-
policies::confirm(title, coin_params, &name, policy, policies::Mode::Basic).await?;
252+
parsed
253+
.confirm(title, coin_params, &name, policies::Mode::Basic)
254+
.await?;
254255
}
255256

256257
let address = common::Payload::from_policy(&parsed, keypath)?.address(coin_params)?;

0 commit comments

Comments
 (0)