Skip to content

Commit eb64b12

Browse files
sisureshsisuresh
committed
expand tests
1 parent 24f4ca0 commit eb64b12

File tree

2 files changed

+70
-58
lines changed

2 files changed

+70
-58
lines changed

‎tests-expanded/test_bls_tests.rs‎

Lines changed: 45 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ extern crate core;
77
extern crate compiler_builtins as _;
88
use soroban_sdk::{
99
contract, contractimpl, contracttype,
10-
crypto::bls12_381::{Fp, Fp2, Fr, G1Affine, G2Affine},
10+
crypto::bls12_381::{Bls12381Fp, Bls12381Fp2, Bls12381G1Affine, Bls12381G2Affine, Fr},
1111
log, Env,
1212
};
1313
pub struct DummyProof {
14-
pub fp: Fp,
15-
pub fp2: Fp2,
16-
pub g1: G1Affine,
17-
pub g2: G2Affine,
14+
pub fp: Bls12381Fp,
15+
pub fp2: Bls12381Fp2,
16+
pub g1: Bls12381G1Affine,
17+
pub g2: Bls12381G2Affine,
1818
pub fr: Fr,
1919
}
2020
pub static __SPEC_XDR_TYPE_DUMMYPROOF: [u8; 128usize] = DummyProof::spec_xdr();
@@ -282,10 +282,10 @@ const _: () = {
282282
use soroban_sdk::testutils::arbitrary::arbitrary;
283283
use soroban_sdk::testutils::arbitrary::std;
284284
pub struct ArbitraryDummyProof {
285-
fp: <Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
286-
fp2: <Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
287-
g1: <G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
288-
g2: <G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
285+
fp: <Bls12381Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
286+
fp2: <Bls12381Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
287+
g1: <Bls12381G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
288+
g2: <Bls12381G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
289289
fr: <Fr as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
290290
}
291291
#[automatically_derived]
@@ -328,16 +328,16 @@ const _: () = {
328328
#[coverage(off)]
329329
fn assert_receiver_is_total_eq(&self) -> () {
330330
let _: ::core::cmp::AssertParamIsEq<
331-
<Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
331+
<Bls12381Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
332332
>;
333333
let _: ::core::cmp::AssertParamIsEq<
334-
<Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
334+
<Bls12381Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
335335
>;
336336
let _: ::core::cmp::AssertParamIsEq<
337-
<G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
337+
<Bls12381G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
338338
>;
339339
let _: ::core::cmp::AssertParamIsEq<
340-
<G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
340+
<Bls12381G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
341341
>;
342342
let _: ::core::cmp::AssertParamIsEq<
343343
<Fr as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype,
@@ -513,16 +513,16 @@ const _: () = {
513513
arbitrary::size_hint::recursion_guard(depth, |depth| {
514514
arbitrary::size_hint::and_all(
515515
&[
516-
<<Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
516+
<<Bls12381Fp as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
517517
depth,
518518
),
519-
<<Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
519+
<<Bls12381Fp2 as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
520520
depth,
521521
),
522-
<<G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
522+
<<Bls12381G1Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
523523
depth,
524524
),
525-
<<G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
525+
<<Bls12381G2Affine as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
526526
depth,
527527
),
528528
<<Fr as soroban_sdk::testutils::arbitrary::SorobanArbitrary>::Prototype as arbitrary::Arbitrary>::size_hint(
@@ -698,10 +698,10 @@ impl soroban_sdk::testutils::ContractFunctionSet for Contract {
698698
}
699699
}
700700
impl Contract {
701-
pub fn g1_mul(env: Env, p: G1Affine, s: Fr) -> G1Affine {
701+
pub fn g1_mul(env: Env, p: Bls12381G1Affine, s: Fr) -> Bls12381G1Affine {
702702
env.crypto().bls12_381().g1_mul(&p, &s)
703703
}
704-
pub fn g2_mul(env: Env, p: G2Affine, s: Fr) -> G2Affine {
704+
pub fn g2_mul(env: Env, p: Bls12381G2Affine, s: Fr) -> Bls12381G2Affine {
705705
env.crypto().bls12_381().g2_mul(&p, &s)
706706
}
707707
pub fn dummy_verify(env: Env, proof: DummyProof) -> bool {
@@ -771,7 +771,7 @@ impl Contract {
771771
}
772772
}
773773
impl<'a> ContractClient<'a> {
774-
pub fn g1_mul(&self, p: &G1Affine, s: &Fr) -> G1Affine {
774+
pub fn g1_mul(&self, p: &Bls12381G1Affine, s: &Fr) -> Bls12381G1Affine {
775775
use core::ops::Not;
776776
let old_auth_manager = self
777777
.env
@@ -813,15 +813,18 @@ impl<'a> ContractClient<'a> {
813813
}
814814
pub fn try_g1_mul(
815815
&self,
816-
p: &G1Affine,
816+
p: &Bls12381G1Affine,
817817
s: &Fr,
818818
) -> Result<
819819
Result<
820-
G1Affine,
821-
<G1Affine as soroban_sdk::TryFromVal<soroban_sdk::Env, soroban_sdk::Val>>::Error,
820+
Bls12381G1Affine,
821+
<Bls12381G1Affine as soroban_sdk::TryFromVal<
822+
soroban_sdk::Env,
823+
soroban_sdk::Val,
824+
>>::Error,
822825
>,
823826
Result<soroban_sdk::Error, soroban_sdk::InvokeError>,
824-
> {
827+
>{
825828
use core::ops::Not;
826829
let old_auth_manager = self
827830
.env
@@ -857,7 +860,7 @@ impl<'a> ContractClient<'a> {
857860
}
858861
res
859862
}
860-
pub fn g2_mul(&self, p: &G2Affine, s: &Fr) -> G2Affine {
863+
pub fn g2_mul(&self, p: &Bls12381G2Affine, s: &Fr) -> Bls12381G2Affine {
861864
use core::ops::Not;
862865
let old_auth_manager = self
863866
.env
@@ -899,15 +902,18 @@ impl<'a> ContractClient<'a> {
899902
}
900903
pub fn try_g2_mul(
901904
&self,
902-
p: &G2Affine,
905+
p: &Bls12381G2Affine,
903906
s: &Fr,
904907
) -> Result<
905908
Result<
906-
G2Affine,
907-
<G2Affine as soroban_sdk::TryFromVal<soroban_sdk::Env, soroban_sdk::Val>>::Error,
909+
Bls12381G2Affine,
910+
<Bls12381G2Affine as soroban_sdk::TryFromVal<
911+
soroban_sdk::Env,
912+
soroban_sdk::Val,
913+
>>::Error,
908914
>,
909915
Result<soroban_sdk::Error, soroban_sdk::InvokeError>,
910-
> {
916+
>{
911917
use core::ops::Not;
912918
let old_auth_manager = self
913919
.env
@@ -1015,12 +1021,12 @@ impl<'a> ContractClient<'a> {
10151021
impl ContractArgs {
10161022
#[inline(always)]
10171023
#[allow(clippy::unused_unit)]
1018-
pub fn g1_mul<'i>(p: &'i G1Affine, s: &'i Fr) -> (&'i G1Affine, &'i Fr) {
1024+
pub fn g1_mul<'i>(p: &'i Bls12381G1Affine, s: &'i Fr) -> (&'i Bls12381G1Affine, &'i Fr) {
10191025
(p, s)
10201026
}
10211027
#[inline(always)]
10221028
#[allow(clippy::unused_unit)]
1023-
pub fn g2_mul<'i>(p: &'i G2Affine, s: &'i Fr) -> (&'i G2Affine, &'i Fr) {
1029+
pub fn g2_mul<'i>(p: &'i Bls12381G2Affine, s: &'i Fr) -> (&'i Bls12381G2Affine, &'i Fr) {
10241030
(p, s)
10251031
}
10261032
#[inline(always)]
@@ -1251,7 +1257,7 @@ mod test {
12511257
let env = Env::default();
12521258
let contract_id = env.register(Contract, ());
12531259
let client = ContractClient::new(&env, &contract_id);
1254-
let g1 = G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1260+
let g1 = Bls12381G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
12551261
&env,
12561262
&[
12571263
23u8, 241u8, 211u8, 167u8, 49u8, 151u8, 215u8, 148u8, 38u8, 149u8, 99u8, 140u8,
@@ -1271,7 +1277,7 @@ mod test {
12711277
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
12721278
],
12731279
));
1274-
let inf = G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1280+
let inf = Bls12381G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
12751281
&env,
12761282
&[
12771283
64u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
@@ -1325,7 +1331,7 @@ mod test {
13251331
let env = Env::default();
13261332
let contract_id = env.register(Contract, ());
13271333
let client = ContractClient::new(&env, &contract_id);
1328-
let g2 = G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1334+
let g2 = Bls12381G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
13291335
&env,
13301336
&[
13311337
19u8, 224u8, 43u8, 96u8, 82u8, 113u8, 159u8, 96u8, 125u8, 172u8, 211u8, 160u8,
@@ -1353,7 +1359,7 @@ mod test {
13531359
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
13541360
],
13551361
));
1356-
let inf = G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1362+
let inf = Bls12381G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
13571363
&env,
13581364
&[
13591365
64u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
@@ -1413,15 +1419,15 @@ mod test {
14131419
let env = Env::default();
14141420
let contract_id = env.register(Contract, ());
14151421
let client = ContractClient::new(&env, &contract_id);
1416-
let fp = Fp::from_bytes(::soroban_sdk::BytesN::from_array(
1422+
let fp = Bls12381Fp::from_bytes(::soroban_sdk::BytesN::from_array(
14171423
&env,
14181424
&[
14191425
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
14201426
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
14211427
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8,
14221428
],
14231429
));
1424-
let fp2 = Fp2::from_bytes(::soroban_sdk::BytesN::from_array(
1430+
let fp2 = Bls12381Fp2::from_bytes(::soroban_sdk::BytesN::from_array(
14251431
&env,
14261432
&[
14271433
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8,
@@ -1432,7 +1438,7 @@ mod test {
14321438
0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 1u8,
14331439
],
14341440
));
1435-
let g1 = G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1441+
let g1 = Bls12381G1Affine::from_bytes(::soroban_sdk::BytesN::from_array(
14361442
&env,
14371443
&[
14381444
23u8, 241u8, 211u8, 167u8, 49u8, 151u8, 215u8, 148u8, 38u8, 149u8, 99u8, 140u8,
@@ -1445,7 +1451,7 @@ mod test {
14451451
136u8, 138u8, 228u8, 12u8, 170u8, 35u8, 41u8, 70u8, 197u8, 231u8, 225u8,
14461452
],
14471453
));
1448-
let g2 = G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
1454+
let g2 = Bls12381G2Affine::from_bytes(::soroban_sdk::BytesN::from_array(
14491455
&env,
14501456
&[
14511457
19u8, 224u8, 43u8, 96u8, 82u8, 113u8, 159u8, 96u8, 125u8, 172u8, 211u8, 160u8,

‎tests-expanded/test_bls_wasm32v1-none.rs‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ extern crate core;
77
extern crate compiler_builtins as _;
88
use soroban_sdk::{
99
contract, contractimpl, contracttype,
10-
crypto::bls12_381::{Fp, Fp2, Fr, G1Affine, G2Affine},
10+
crypto::bls12_381::{Bls12381Fp, Bls12381Fp2, Bls12381G1Affine, Bls12381G2Affine, Fr},
1111
log, Env,
1212
};
1313
pub struct DummyProof {
14-
pub fp: Fp,
15-
pub fp2: Fp2,
16-
pub g1: G1Affine,
17-
pub g2: G2Affine,
14+
pub fp: Bls12381Fp,
15+
pub fp2: Bls12381Fp2,
16+
pub g1: Bls12381G1Affine,
17+
pub g2: Bls12381G2Affine,
1818
pub fr: Fr,
1919
}
2020
#[link_section = "contractspecv0"]
@@ -119,10 +119,10 @@ impl<'a> ContractClient<'a> {
119119
}
120120
}
121121
impl Contract {
122-
pub fn g1_mul(env: Env, p: G1Affine, s: Fr) -> G1Affine {
122+
pub fn g1_mul(env: Env, p: Bls12381G1Affine, s: Fr) -> Bls12381G1Affine {
123123
env.crypto().bls12_381().g1_mul(&p, &s)
124124
}
125-
pub fn g2_mul(env: Env, p: G2Affine, s: Fr) -> G2Affine {
125+
pub fn g2_mul(env: Env, p: Bls12381G2Affine, s: Fr) -> Bls12381G2Affine {
126126
env.crypto().bls12_381().g2_mul(&p, &s)
127127
}
128128
pub fn dummy_verify(env: Env, proof: DummyProof) -> bool {
@@ -195,7 +195,7 @@ impl Contract {
195195
}
196196
}
197197
impl<'a> ContractClient<'a> {
198-
pub fn g1_mul(&self, p: &G1Affine, s: &Fr) -> G1Affine {
198+
pub fn g1_mul(&self, p: &Bls12381G1Affine, s: &Fr) -> Bls12381G1Affine {
199199
use core::ops::Not;
200200
use soroban_sdk::{FromVal, IntoVal};
201201
let res = self.env.invoke_contract(
@@ -214,15 +214,18 @@ impl<'a> ContractClient<'a> {
214214
}
215215
pub fn try_g1_mul(
216216
&self,
217-
p: &G1Affine,
217+
p: &Bls12381G1Affine,
218218
s: &Fr,
219219
) -> Result<
220220
Result<
221-
G1Affine,
222-
<G1Affine as soroban_sdk::TryFromVal<soroban_sdk::Env, soroban_sdk::Val>>::Error,
221+
Bls12381G1Affine,
222+
<Bls12381G1Affine as soroban_sdk::TryFromVal<
223+
soroban_sdk::Env,
224+
soroban_sdk::Val,
225+
>>::Error,
223226
>,
224227
Result<soroban_sdk::Error, soroban_sdk::InvokeError>,
225-
> {
228+
>{
226229
use soroban_sdk::{FromVal, IntoVal};
227230
let res = self.env.try_invoke_contract(
228231
&self.address,
@@ -238,7 +241,7 @@ impl<'a> ContractClient<'a> {
238241
);
239242
res
240243
}
241-
pub fn g2_mul(&self, p: &G2Affine, s: &Fr) -> G2Affine {
244+
pub fn g2_mul(&self, p: &Bls12381G2Affine, s: &Fr) -> Bls12381G2Affine {
242245
use core::ops::Not;
243246
use soroban_sdk::{FromVal, IntoVal};
244247
let res = self.env.invoke_contract(
@@ -257,15 +260,18 @@ impl<'a> ContractClient<'a> {
257260
}
258261
pub fn try_g2_mul(
259262
&self,
260-
p: &G2Affine,
263+
p: &Bls12381G2Affine,
261264
s: &Fr,
262265
) -> Result<
263266
Result<
264-
G2Affine,
265-
<G2Affine as soroban_sdk::TryFromVal<soroban_sdk::Env, soroban_sdk::Val>>::Error,
267+
Bls12381G2Affine,
268+
<Bls12381G2Affine as soroban_sdk::TryFromVal<
269+
soroban_sdk::Env,
270+
soroban_sdk::Val,
271+
>>::Error,
266272
>,
267273
Result<soroban_sdk::Error, soroban_sdk::InvokeError>,
268-
> {
274+
>{
269275
use soroban_sdk::{FromVal, IntoVal};
270276
let res = self.env.try_invoke_contract(
271277
&self.address,
@@ -310,12 +316,12 @@ impl<'a> ContractClient<'a> {
310316
impl ContractArgs {
311317
#[inline(always)]
312318
#[allow(clippy::unused_unit)]
313-
pub fn g1_mul<'i>(p: &'i G1Affine, s: &'i Fr) -> (&'i G1Affine, &'i Fr) {
319+
pub fn g1_mul<'i>(p: &'i Bls12381G1Affine, s: &'i Fr) -> (&'i Bls12381G1Affine, &'i Fr) {
314320
(p, s)
315321
}
316322
#[inline(always)]
317323
#[allow(clippy::unused_unit)]
318-
pub fn g2_mul<'i>(p: &'i G2Affine, s: &'i Fr) -> (&'i G2Affine, &'i Fr) {
324+
pub fn g2_mul<'i>(p: &'i Bls12381G2Affine, s: &'i Fr) -> (&'i Bls12381G2Affine, &'i Fr) {
319325
(p, s)
320326
}
321327
#[inline(always)]

0 commit comments

Comments
 (0)