Skip to content

Commit 372e747

Browse files
NeopalliumNeopallium
committed
Update serialization tests.
1 parent bbb79d9 commit 372e747

10 files changed

Lines changed: 61 additions & 84 deletions

File tree

‎src/bp/account.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,8 +543,7 @@ impl<T: DartLimits> AccountAssetRegistrationProof<T> {
543543

544544
let device_response = create_registration_auth_proof(
545545
rng,
546-
keys.acct.secret.0.0,
547-
keys.enc.secret.0.0,
546+
keys,
548547
&device_request,
549548
gens.account_comm_key().sk_gen(),
550549
gens.account_comm_key().sk_enc_gen(),

‎src/bp/affirmation_proofs.rs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,7 @@ macro_rules! with_balance {
272272

273273
let device_response = $crate::bp::auth_proofs::create_affirmation_auth_proof(
274274
rng,
275-
keys.acct.secret.0.0,
276-
keys.enc.secret.0.0,
275+
keys,
277276
&device_request,
278277
gens.account_comm_key().sk_gen(),
279278
gens.enc_key_gen(),
@@ -624,8 +623,7 @@ macro_rules! no_balance {
624623

625624
let device_response = $crate::bp::auth_proofs::create_affirmation_auth_proof(
626625
rng,
627-
keys.acct.secret.0.0,
628-
keys.enc.secret.0.0,
626+
keys,
629627
&device_request,
630628
gens.account_comm_key().sk_gen(),
631629
gens.enc_key_gen(),

‎src/bp/asset.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ impl<
286286
let gens = dart_gens();
287287
let device_response = create_registration_auth_proof(
288288
rng,
289-
keys.acct.secret.0.0,
290-
keys.enc.secret.0.0,
289+
keys,
291290
&device_request,
292291
gens.account_comm_key().sk_gen(),
293292
gens.account_comm_key().sk_enc_gen(),

‎src/bp/auth_proofs.rs‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,22 @@ fn ledger_nonce(challenge_h_bytes: &[u8], nonce: &[u8]) -> Vec<u8> {
2424
/// Create `AuthProofOnlySk` for fee registration and fee topup proofs (1 key).
2525
pub fn create_fee_account_auth_proof<R: RngCore + CryptoRng>(
2626
rng: &mut R,
27-
sk: PallasScalar,
27+
key: &AccountKeyPair,
2828
request: &FeeAccountDeviceRequest,
2929
sk_gen: PallasA,
3030
) -> Result<SingleSkDeviceResponse, Error> {
3131
let nonce = ledger_nonce(&request.challenge_h_bytes, &request.nonce);
3232
let pk = PallasA::try_from(&request.pk)?;
3333

34-
let proof = BPAuthProofOnlySk::new(rng, sk, pk, &nonce, &sk_gen)?;
34+
let proof = BPAuthProofOnlySk::new(rng, key.secret.0.0, pk, &nonce, &sk_gen)?;
3535

3636
Ok(SingleSkDeviceResponse(WrappedCanonical::wrap(&proof)?))
3737
}
3838

3939
/// Create `AuthProofOnlySks` for account registration and mint proofs (2 keys).
4040
pub fn create_registration_auth_proof<R: RngCore + CryptoRng>(
4141
rng: &mut R,
42-
sk: PallasScalar,
43-
sk_enc: PallasScalar,
42+
keys: &AccountKeys,
4443
request: &RegistrationDeviceRequest,
4544
sk_gen: PallasA,
4645
sk_enc_gen: PallasA,
@@ -51,8 +50,8 @@ pub fn create_registration_auth_proof<R: RngCore + CryptoRng>(
5150

5251
let proof = BPAuthProofOnlySks::new(
5352
rng,
54-
sk,
55-
sk_enc,
53+
keys.acct.secret.0.0,
54+
keys.enc.secret.0.0,
5655
pk_aff,
5756
pk_enc,
5857
&nonce,
@@ -66,7 +65,7 @@ pub fn create_registration_auth_proof<R: RngCore + CryptoRng>(
6665
/// Create `AuthProofFeePayment` for fee payment proofs.
6766
pub fn create_fee_payment_auth_proof<R: RngCore + CryptoRng>(
6867
rng: &mut R,
69-
sk: PallasScalar,
68+
key: &AccountKeyPair,
7069
request: &FeePaymentDeviceRequest,
7170
sk_gen: PallasA,
7271
randomness_gen: PallasA,
@@ -81,7 +80,7 @@ pub fn create_fee_payment_auth_proof<R: RngCore + CryptoRng>(
8180

8281
let proof = BPAuthProofFeePayment::new(
8382
rng,
84-
sk,
83+
key.secret.0.0,
8584
auth_rerandomization,
8685
auth_new_randomness,
8786
&rerandomized_leaf,
@@ -99,8 +98,7 @@ pub fn create_fee_payment_auth_proof<R: RngCore + CryptoRng>(
9998
/// Create `AuthProofAffirmation` for affirmation/claim/reversal/counter-update proofs.
10099
pub fn create_affirmation_auth_proof<R: RngCore + CryptoRng>(
101100
rng: &mut R,
102-
sk: PallasScalar,
103-
sk_enc: PallasScalar,
101+
keys: &AccountKeys,
104102
request: &AffirmationDeviceRequest,
105103
sk_gen: PallasA,
106104
enc_key_gen: PallasA,
@@ -133,8 +131,8 @@ pub fn create_affirmation_auth_proof<R: RngCore + CryptoRng>(
133131

134132
let proof = BPAuthProofAffirmation::new(
135133
rng,
136-
sk,
137-
sk_enc,
134+
keys.acct.secret.0.0,
135+
keys.enc.secret.0.0,
138136
auth_rerandomization,
139137
auth_rand_new_comm,
140138
k_amounts,

‎src/bp/fee.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ impl<T: DartLimits> FeeAccountRegistrationProof<T> {
321321

322322
let device_response = create_fee_account_auth_proof(
323323
rng,
324-
key.secret.0.0,
324+
key,
325325
&device_request,
326326
gens.account_comm_key().sk_gen(),
327327
)?;
@@ -502,7 +502,7 @@ impl<
502502

503503
let device_response = create_fee_account_auth_proof(
504504
rng,
505-
key.secret.0.0,
505+
key,
506506
&device_request,
507507
dart_gens().account_comm_key().sk_gen(),
508508
)?;
@@ -863,7 +863,7 @@ impl<
863863
let comm_re_rand_gen = tree_params.even_parameters.sl_params.pc_gens().B_blinding;
864864
let device_response = create_fee_payment_auth_proof(
865865
rng,
866-
key.secret.0.0,
866+
key,
867867
&device_request,
868868
gens.account_comm_key().sk_gen(),
869869
gens.account_comm_key().randomness_gen(),

‎src/bp/keys.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,13 +203,6 @@ impl AccountPublicKey {
203203
)]
204204
pub struct AccountSecretKey(pub(crate) bp_keys::SigKey<PallasA>);
205205

206-
impl AccountSecretKey {
207-
/// Gets the inner signing key.
208-
pub fn inner(&self) -> &bp_keys::SigKey<PallasA> {
209-
&self.0
210-
}
211-
}
212-
213206
/// The account key pair, consisting of the public and secret keys.
214207
#[derive(
215208
Clone, Debug, Encode, Decode, DecodeWithMemTracking, PartialEq, Eq, Zeroize, ZeroizeOnDrop,

‎src/bp/mod.rs‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,9 @@ mod tests {
444444
let (protocol, device_request) =
445445
FeeRegHostProtocol::init(&mut rng, &keys.acct.public, &account_state, ctx).unwrap();
446446

447-
let sk = keys.acct.secret.0.0;
448447
let device_response = create_fee_account_auth_proof(
449448
&mut rng,
450-
sk,
449+
&keys.acct,
451450
&device_request,
452451
dart_gens().account_comm_key().sk_gen(),
453452
)
@@ -495,10 +494,9 @@ mod tests {
495494
)
496495
.unwrap();
497496

498-
let sk = keys.acct.secret.0.0;
499497
let device_response = create_fee_account_auth_proof(
500498
&mut rng,
501-
sk,
499+
&keys.acct,
502500
&device_request,
503501
dart_gens().account_comm_key().sk_gen(),
504502
)
@@ -568,7 +566,6 @@ mod tests {
568566
)
569567
.unwrap();
570568

571-
let sk = keys.acct.secret.0.0;
572569
let gens = dart_gens();
573570
let tree_params_for_gens = FeeAccountTreeConfig::parameters();
574571
let comm_re_rand_gen = tree_params_for_gens
@@ -578,7 +575,7 @@ mod tests {
578575
.B_blinding;
579576
let device_response = create_fee_payment_auth_proof(
580577
&mut rng,
581-
sk,
578+
&keys.acct,
582579
&device_request,
583580
gens.account_comm_key().sk_gen(),
584581
gens.account_comm_key().randomness_gen(),
@@ -615,12 +612,9 @@ mod tests {
615612
.unwrap();
616613

617614
let gens = dart_gens();
618-
let sk = keys.acct.secret.0.0;
619-
let sk_enc = keys.enc.secret.0.0;
620615
let device_response = create_registration_auth_proof(
621616
&mut rng,
622-
sk,
623-
sk_enc,
617+
&keys,
624618
&device_request,
625619
gens.account_comm_key().sk_gen(),
626620
gens.account_comm_key().sk_enc_gen(),
@@ -661,17 +655,15 @@ mod tests {
661655
let gens = dart_gens();
662656
let device_response1 = create_registration_auth_proof(
663657
&mut rng,
664-
keys1.acct.secret.0.0,
665-
keys1.enc.secret.0.0,
658+
&keys1,
666659
&device_request1,
667660
gens.account_comm_key().sk_gen(),
668661
gens.account_comm_key().sk_enc_gen(),
669662
)
670663
.unwrap();
671664
let device_response2 = create_registration_auth_proof(
672665
&mut rng,
673-
keys2.acct.secret.0.0,
674-
keys2.enc.secret.0.0,
666+
&keys2,
675667
&device_request2,
676668
gens.account_comm_key().sk_gen(),
677669
gens.account_comm_key().sk_enc_gen(),
@@ -734,12 +726,9 @@ mod tests {
734726
.unwrap();
735727

736728
let gens = dart_gens();
737-
let sk = keys.acct.secret.0.0;
738-
let sk_enc = keys.enc.secret.0.0;
739729
let device_response = create_registration_auth_proof(
740730
&mut rng,
741-
sk,
742-
sk_enc,
731+
&keys,
743732
&device_request,
744733
gens.account_comm_key().sk_gen(),
745734
gens.account_comm_key().sk_enc_gen(),
@@ -765,8 +754,7 @@ mod tests {
765754
let gens = dart_gens();
766755
create_affirmation_auth_proof(
767756
rng,
768-
keys.acct.secret.0.0,
769-
keys.enc.secret.0.0,
757+
keys,
770758
request,
771759
gens.account_comm_key().sk_gen(),
772760
gens.enc_key_gen(),

‎tests/serialized_objects_test/account.rs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -149,17 +149,22 @@ pub fn gen_encryption_key_registration_proof() {
149149
pub fn gen_fee_account_registration_proof() {
150150
let mut rng = default_rng();
151151
let fee_keys = alice_keys();
152-
let (proof, _) =
153-
FeeAccountRegistrationProof::new(&mut rng, &fee_keys.acct, ASSET_ID_1, BALANCE, IDENTITY)
154-
.unwrap();
152+
let (proof, _) = FeeAccountRegistrationProof::<()>::new(
153+
&mut rng,
154+
&fee_keys.acct,
155+
ASSET_ID_1,
156+
BALANCE,
157+
IDENTITY,
158+
)
159+
.unwrap();
155160
save_scale_v1(FEE_ACCOUNT_REGISTRATION_PROOF, &proof);
156161
}
157162

158163
pub fn gen_account_asset_registration_proof() {
159164
let mut rng = default_rng();
160165
let tree_params = AccountTreeConfig::parameters();
161166
let asset_reg_keys = alice_keys();
162-
let (proof, _) = AccountAssetRegistrationProof::new(
167+
let (proof, _) = AccountAssetRegistrationProof::<()>::new(
163168
&mut rng,
164169
&asset_reg_keys,
165170
ASSET_ID_1,
@@ -231,7 +236,7 @@ pub fn gen_key_distribution_proof_2_recipients() {
231236
.iter()
232237
.map(|s| AccountKeys::from_seed(s).unwrap().enc.public)
233238
.collect();
234-
let proof = KeyDistributionProof::new(
239+
let proof = KeyDistributionProof::<()>::new(
235240
&mut rng,
236241
dist_keys.enc.secret.clone(),
237242
&dist_keys.enc.public,
@@ -251,7 +256,7 @@ pub fn gen_key_distribution_proof_3_recipients() {
251256
.iter()
252257
.map(|s| AccountKeys::from_seed(s).unwrap().enc.public)
253258
.collect();
254-
let proof = KeyDistributionProof::new(
259+
let proof = KeyDistributionProof::<()>::new(
255260
&mut rng,
256261
dist_keys.enc.secret.clone(),
257262
&dist_keys.enc.public,
@@ -268,7 +273,7 @@ pub fn gen_asset_minting_proof() {
268273
let keys = alice_keys();
269274
let (mut asset_state, _) = AccountAssetState::new(&keys, ASSET_ID_1, 0u16, IDENTITY).unwrap();
270275
let account_tree = alice_account_tree(&keys);
271-
let proof = AssetMintingProof::new(
276+
let proof = AssetMintingProof::<()>::new(
272277
&mut rng,
273278
&keys,
274279
IDENTITY,

‎tests/serialized_objects_test/fee.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn gen_fee_account_topup_proof() {
2525
let mut rng = default_rng();
2626
let keys = alice_keys();
2727
let (fee_tree, mut fee_state) = alice_fee_tree(&keys);
28-
let proof = FeeAccountTopupProof::new(
28+
let proof = FeeAccountTopupProof::<()>::new(
2929
&mut rng,
3030
&keys.acct,
3131
&mut fee_state,
@@ -41,7 +41,7 @@ pub fn gen_fee_account_payment_proof() {
4141
let mut rng = default_rng();
4242
let keys = alice_keys();
4343
let (mut fee_tree, mut fee_state) = alice_fee_tree(&keys);
44-
let topup_proof = FeeAccountTopupProof::new(
44+
let topup_proof = FeeAccountTopupProof::<()>::new(
4545
&mut rng,
4646
&keys.acct,
4747
&mut fee_state,
@@ -57,7 +57,7 @@ pub fn gen_fee_account_payment_proof() {
5757
.unwrap();
5858
fee_tree.insert(updated_leaf).unwrap();
5959
fee_tree.store_root().unwrap();
60-
let proof = FeeAccountPaymentProof::new(
60+
let proof = FeeAccountPaymentProof::<()>::new(
6161
&mut rng,
6262
&keys.acct,
6363
IDENTITY,
@@ -72,7 +72,7 @@ pub fn gen_fee_account_payment_proof() {
7272
fn fee_tree_after_topup(keys: &AccountKeys) -> FeeProverTree {
7373
let mut rng = default_rng();
7474
let (mut fee_tree, mut fee_state) = alice_fee_tree(keys);
75-
let topup_proof = FeeAccountTopupProof::new(
75+
let topup_proof = FeeAccountTopupProof::<()>::new(
7676
&mut rng,
7777
&keys.acct,
7878
&mut fee_state,

0 commit comments

Comments
 (0)