Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit fb2be90

Browse files
committed
fixed batch verificaiton tests
removed additional zero verificaiton tests
1 parent c218174 commit fb2be90

File tree

1 file changed

+14
-31
lines changed

1 file changed

+14
-31
lines changed

primitives/io/src/lib.rs

Lines changed: 14 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,19 +1575,18 @@ mod tests {
15751575
ext.register_extension(TaskExecutorExt::new(TaskExecutor::new()));
15761576
ext.execute_with(|| {
15771577
let pair = sr25519::Pair::generate_with_phrase(None).0;
1578+
let pair_unused = sr25519::Pair::generate_with_phrase(None).0;
15781579
crypto::start_batch_verify();
15791580
for it in 0..70 {
15801581
let msg = format!("Schnorrkel {}!", it);
15811582
let signature = pair.sign(msg.as_bytes());
15821583
crypto::sr25519_batch_verify(&signature, msg.as_bytes(), &pair.public());
15831584
}
15841585

1585-
// push invlaid
1586-
crypto::sr25519_batch_verify(
1587-
&Default::default(),
1588-
&Vec::new(),
1589-
&Default::default(),
1590-
);
1586+
// push invalid
1587+
let msg = format!("asdf!");
1588+
let signature = pair.sign(msg.as_bytes());
1589+
crypto::sr25519_batch_verify(&signature, msg.as_bytes(), &pair_unused.public());
15911590
assert!(!crypto::finish_batch_verify());
15921591

15931592
crypto::start_batch_verify();
@@ -1605,15 +1604,6 @@ mod tests {
16051604
let mut ext = BasicExternalities::default();
16061605
ext.register_extension(TaskExecutorExt::new(TaskExecutor::new()));
16071606
ext.execute_with(|| {
1608-
// invalid ed25519 signature
1609-
crypto::start_batch_verify();
1610-
crypto::ed25519_batch_verify(
1611-
&Default::default(),
1612-
&Vec::new(),
1613-
&Default::default(),
1614-
);
1615-
assert!(!crypto::finish_batch_verify());
1616-
16171607
// 2 valid ed25519 signatures
16181608
crypto::start_batch_verify();
16191609

@@ -1632,16 +1622,13 @@ mod tests {
16321622
// 1 valid, 1 invalid ed25519 signature
16331623
crypto::start_batch_verify();
16341624

1635-
let pair = ed25519::Pair::generate_with_phrase(None).0;
1625+
let pair1 = ed25519::Pair::generate_with_phrase(None).0;
1626+
let pair2 = ed25519::Pair::generate_with_phrase(None).0;
16361627
let msg = b"Important message";
1637-
let signature = pair.sign(msg);
1638-
crypto::ed25519_batch_verify(&signature, msg, &pair.public());
1628+
let signature = pair1.sign(msg);
16391629

1640-
crypto::ed25519_batch_verify(
1641-
&Default::default(),
1642-
&Vec::new(),
1643-
&Default::default(),
1644-
);
1630+
crypto::ed25519_batch_verify(&signature, msg, &pair1.public());
1631+
crypto::ed25519_batch_verify(&signature, msg, &pair2.public());
16451632

16461633
assert!(!crypto::finish_batch_verify());
16471634

@@ -1668,16 +1655,12 @@ mod tests {
16681655
// 1 valid sr25519, 1 invalid sr25519
16691656
crypto::start_batch_verify();
16701657

1671-
let pair = sr25519::Pair::generate_with_phrase(None).0;
1658+
let pair1 = sr25519::Pair::generate_with_phrase(None).0;
1659+
let pair2 = sr25519::Pair::generate_with_phrase(None).0;
16721660
let msg = b"Schnorrkcel!";
16731661
let signature = pair.sign(msg);
1674-
crypto::sr25519_batch_verify(&signature, msg, &pair.public());
1675-
1676-
crypto::sr25519_batch_verify(
1677-
&Default::default(),
1678-
&Vec::new(),
1679-
&Default::default(),
1680-
);
1662+
crypto::sr25519_batch_verify(&signature, msg, &pair1.public());
1663+
crypto::sr25519_batch_verify(&signature, msg, &pair2.public());
16811664

16821665
assert!(!crypto::finish_batch_verify());
16831666
});

0 commit comments

Comments
 (0)