Skip to content
Snippets Groups Projects
Commit 48348b42 authored by Éloïs's avatar Éloïs Committed by Éloïs
Browse files

[ref] generate_signator() cannot fail.

parent 1881c2d5
Branches
Tags
No related merge requests found
......@@ -126,11 +126,7 @@ mod tests {
10, 11, 12, 13, 14, 15,
]));
let signator = SignatorEnum::Ed25519(
key_pair
.generate_signator()
.expect("fail to generate signator !"),
);
let signator = SignatorEnum::Ed25519(key_pair.generate_signator());
let mut bin_signable_datas = BinSignableTestImpl {
datas: vec![0, 1, 2, 3],
......
......@@ -303,11 +303,8 @@ impl PartialEq<Ed25519KeyPair> for Ed25519KeyPair {
impl super::KeyPair for Ed25519KeyPair {
type Signator = Signator;
fn generate_signator(&self) -> Result<Self::Signator, super::SignError> {
Ok(Signator(
RingKeyPair::from_seed_and_public_key(self.seed.as_ref(), self.pubkey.as_ref())
.map_err(|_| super::SignError::CorruptedKeyPair)?,
))
fn generate_signator(&self) -> Self::Signator {
Signator(RingKeyPair::from_seed_unchecked(self.seed.as_ref()).expect("invalid seed"))
}
fn public_key(&self) -> PublicKey {
......@@ -651,9 +648,7 @@ UniqueID: tic
Timestamp: 0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
";
let signator = KeyPairFromSeed32Generator::generate(seed)
.generate_signator()
.expect("fail to generate signator !");
let signator = KeyPairFromSeed32Generator::generate(seed).generate_signator();
let pubkey = signator.public_key();
let sig = signator.sign(message.as_bytes());
let wrong_sig = Signature([
......@@ -719,10 +714,7 @@ UniqueID: tic
Timestamp: 0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855
";
let sig = keypair
.generate_signator()
.expect("fail to gen signator")
.sign(message.as_bytes());
let sig = keypair.generate_signator().sign(message.as_bytes());
assert!(keypair.verify(message.as_bytes(), &sig).is_ok());
}
......
......@@ -31,7 +31,7 @@
//! "password".to_owned(),
//! ));
//!
//! let signator = keypair.generate_signator().expect("keypair corrupted");
//! let signator = keypair.generate_signator();
//!
//! let message = "Hello, world!";
//!
......@@ -339,7 +339,7 @@ pub trait KeyPair: Clone + Display + Debug + PartialEq + Eq {
type Signator: Signator;
/// Generate signator.
fn generate_signator(&self) -> Result<Self::Signator, SignError>;
fn generate_signator(&self) -> Self::Signator;
/// Get `PublicKey`
fn public_key(&self) -> <Self::Signator as Signator>::PublicKey;
......@@ -401,10 +401,10 @@ impl Display for KeyPairEnum {
impl KeyPair for KeyPairEnum {
type Signator = SignatorEnum;
fn generate_signator(&self) -> Result<Self::Signator, SignError> {
fn generate_signator(&self) -> Self::Signator {
match self {
KeyPairEnum::Ed25519(ref ed25519_keypair) => {
Ok(SignatorEnum::Ed25519(ed25519_keypair.generate_signator()?))
SignatorEnum::Ed25519(ed25519_keypair.generate_signator())
}
KeyPairEnum::Schnorr() => panic!("Schnorr algo not yet supported !"),
}
......
......@@ -102,9 +102,7 @@ mod tests {
fn test_text_signable() {
let key_pair = super::super::tests::valid_key_pair_1();
let signator = key_pair
.generate_signator()
.expect("fail to generate signator");
let signator = key_pair.generate_signator();
let mut text_signable = TextSignableTestImpl {
issuer: key_pair.public_key(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment