From 3c6e19f4e492adb6eee9d3d04d3456839e24ace9 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Fri, 7 Jan 2022 08:49:41 -0700 Subject: [PATCH] Update test vectors. --- .../src/transaction/sighash_v5.rs | 2 +- zcash_primitives/src/transaction/tests.rs | 142 +- .../src/transaction/tests/data.rs | 2073 +++++++++-------- 3 files changed, 1145 insertions(+), 1072 deletions(-) diff --git a/zcash_primitives/src/transaction/sighash_v5.rs b/zcash_primitives/src/transaction/sighash_v5.rs index 465d4b980..1d090ce11 100644 --- a/zcash_primitives/src/transaction/sighash_v5.rs +++ b/zcash_primitives/src/transaction/sighash_v5.rs @@ -190,7 +190,7 @@ pub fn v5_signature_hash< signable_input, ) } else { - hash_transparent_txid_data(txid_parts.transparent_digests.as_ref()) + hash_transparent_txid_data(None) }, txid_parts.sapling_digest, txid_parts.orchard_digest, diff --git a/zcash_primitives/src/transaction/tests.rs b/zcash_primitives/src/transaction/tests.rs index 25d8fbf5e..c271fc67a 100644 --- a/zcash_primitives/src/transaction/tests.rs +++ b/zcash_primitives/src/transaction/tests.rs @@ -8,11 +8,14 @@ use crate::{consensus::BranchId, legacy::Script}; use super::{ components::Amount, sapling, - sighash::{SignableInput, SIGHASH_ALL, SIGHASH_ANYONECANPAY, SIGHASH_NONE, SIGHASH_SINGLE}, + sighash::{ + SignableInput, TransparentAuthorizingContext, SIGHASH_ALL, SIGHASH_ANYONECANPAY, + SIGHASH_NONE, SIGHASH_SINGLE, + }, sighash_v4::v4_signature_hash, sighash_v5::v5_signature_hash, testing::arb_tx, - transparent::{self, builder::AuthorizingContext}, + transparent::{self}, txid::TxIdDigester, Authorization, Transaction, TransactionData, TxDigests, TxIn, }; @@ -164,22 +167,20 @@ fn zip_0243() { } #[derive(Debug)] -struct TestTransparentUnauthorized { +struct TestTransparentAuth { input_amounts: Vec, input_scripts: Vec