Skip to content
Snippets Groups Projects

Elois/ring

Merged Éloïs requested to merge elois/ring into dev
52 files
+ 970
693
Compare changes
  • Side-by-side
  • Inline
Files
52
+ 52
54
@@ -170,14 +170,12 @@ pub fn key_wizard(mut key_pairs: DuniterKeyPairs) -> Result<DuniterKeyPairs, Wiz
@@ -170,14 +170,12 @@ pub fn key_wizard(mut key_pairs: DuniterKeyPairs) -> Result<DuniterKeyPairs, Wiz
mod tests {
mod tests {
use super::*;
use super::*;
static BASE58_SEC_INIT: &'static str =
static BASE58_SEED_INIT: &'static str = "4iXXx5GgRkZ85BVPwn8vFXvztdXAAa5yB573ErcAnngA";
"4iXXx5GgRkZ85BVPwn8vFXvztdXAAa5yB573ErcAnngAgSVEknNqc16xRnCmsuHFAJ3j3XArB4mv8UVpvrG32vLV";
static BASE58_PUB_INIT: &'static str = "otDgSpKvKAPPmE1MUYxc3UQ3RtEnKYz4iGD3BmwKPzM";
static BASE58_PUB_INIT: &'static str = "otDgSpKvKAPPmE1MUYxc3UQ3RtEnKYz4iGD3BmwKPzM";
//static SALT_INIT: &'static str = "initsalt";
//static SALT_INIT: &'static str = "initsalt";
//static PASSWORD_INIT: &'static str = "initpassword";
//static PASSWORD_INIT: &'static str = "initpassword";
static BASE58_SEC_TEST: &'static str =
static BASE58_SEED_TEST: &'static str = "ELjDWGPyCGMuhr7R7H2aip6UJA9qLRepmK77pcD41UqQ";
"4xr2CFHWQtDUQiPCon3FhEAvSpXEoFZHeEPiBzDUtEbt2wnrFS9ZTtAvUyZypbDvw8wmYhHrJgBVo6GidMrpwoQq";
static BASE58_PUB_TEST: &'static str = "6sewkaNWyEMqkEa2PVRWrDb3hxWtjPdUSB1zXVCqhdWV";
static BASE58_PUB_TEST: &'static str = "6sewkaNWyEMqkEa2PVRWrDb3hxWtjPdUSB1zXVCqhdWV";
static SALT_TEST: &'static str = "testsalt";
static SALT_TEST: &'static str = "testsalt";
static PASSWORD_TEST: &'static str = "testpassword";
static PASSWORD_TEST: &'static str = "testpassword";
@@ -185,9 +183,9 @@ mod tests {
@@ -185,9 +183,9 @@ mod tests {
#[test]
#[test]
fn test_modify_member_keys() {
fn test_modify_member_keys() {
let key_pairs = DuniterKeyPairs {
let key_pairs = DuniterKeyPairs {
network_keypair: KeyPairEnum::Ed25519(ed25519::KeyPair {
network_keypair: KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
}),
}),
@@ -203,36 +201,39 @@ mod tests {
@@ -203,36 +201,39 @@ mod tests {
)
)
);
);
assert_eq!(
assert_eq!(
result_key_pairs.network_keypair.private_key(),
result_key_pairs.network_keypair.seed().clone(),
PrivKey::Ed25519(
Seed::from_base58(BASE58_SEED_INIT).expect("Wrong data in BASE58_SEED_INIT"),
ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
.expect("Wrong data in BASE58_SEC_TEST")
)
);
);
// We expect member key to update as intended
// We expect member key to update as intended
assert_eq!(
assert_eq!(
result_key_pairs.member_keypair.unwrap().public_key(),
result_key_pairs
 
.member_keypair
 
.clone()
 
.unwrap()
 
.public_key(),
PubKey::Ed25519(
PubKey::Ed25519(
ed25519::PublicKey::from_base58(BASE58_PUB_TEST)
ed25519::PublicKey::from_base58(BASE58_PUB_TEST)
.expect("Wrong data in BASE58_PUB_TEST")
.expect("Wrong data in BASE58_PUB_TEST")
)
)
);
);
assert_eq!(
assert_eq!(
result_key_pairs.member_keypair.unwrap().private_key(),
result_key_pairs
PrivKey::Ed25519(
.member_keypair
ed25519::PrivateKey::from_base58(BASE58_SEC_TEST)
.clone()
.expect("Wrong data in BASE58_SEC_TEST")
.unwrap()
)
.seed()
 
.clone(),
 
Seed::from_base58(BASE58_SEED_TEST).expect("Wrong data in BASE58_SEED_TEST"),
);
);
}
}
#[test]
#[test]
fn test_modify_network_keys() {
fn test_modify_network_keys() {
let key_pairs = DuniterKeyPairs {
let key_pairs = DuniterKeyPairs {
network_keypair: KeyPairEnum::Ed25519(ed25519::KeyPair {
network_keypair: KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
}),
}),
@@ -248,11 +249,8 @@ mod tests {
@@ -248,11 +249,8 @@ mod tests {
)
)
);
);
assert_eq!(
assert_eq!(
result_key_pairs.network_keypair.private_key(),
result_key_pairs.network_keypair.seed().clone(),
PrivKey::Ed25519(
Seed::from_base58(BASE58_SEED_TEST).expect("Wrong data in BASE58_SEED_TEST")
ed25519::PrivateKey::from_base58(BASE58_SEC_TEST)
.expect("Wrong data in BASE58_SEC_TEST")
)
);
);
// We expect member key not to change
// We expect member key not to change
assert_eq!(result_key_pairs.member_keypair, None);
assert_eq!(result_key_pairs.member_keypair, None);
@@ -261,15 +259,15 @@ mod tests {
@@ -261,15 +259,15 @@ mod tests {
#[test]
#[test]
fn test_clear_network_keys() {
fn test_clear_network_keys() {
let key_pairs = DuniterKeyPairs {
let key_pairs = DuniterKeyPairs {
network_keypair: KeyPairEnum::Ed25519(ed25519::KeyPair {
network_keypair: KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
}),
}),
member_keypair: Some(KeyPairEnum::Ed25519(ed25519::KeyPair {
member_keypair: Some(KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
})),
})),
@@ -284,42 +282,45 @@ mod tests {
@@ -284,42 +282,45 @@ mod tests {
)
)
);
);
assert_ne!(
assert_ne!(
result_key_pairs.network_keypair.private_key(),
result_key_pairs.network_keypair.seed().clone(),
PrivKey::Ed25519(
Seed::from_base58(BASE58_SEED_INIT).expect("Wrong data in BASE58_SEED_TEST")
ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
.expect("Wrong data in BASE58_SEC_TEST")
)
);
);
// We expect member key not to change
// We expect member key not to change
assert_eq!(
assert_eq!(
result_key_pairs.member_keypair.unwrap().public_key(),
result_key_pairs
 
.member_keypair
 
.clone()
 
.unwrap()
 
.public_key(),
PubKey::Ed25519(
PubKey::Ed25519(
ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("Wrong data in BASE58_PUB_TEST")
.expect("Wrong data in BASE58_PUB_TEST")
)
)
);
);
assert_eq!(
assert_eq!(
result_key_pairs.member_keypair.unwrap().private_key(),
result_key_pairs
PrivKey::Ed25519(
.member_keypair
ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
.clone()
.expect("Wrong data in BASE58_SEC_TEST")
.unwrap()
)
.seed()
 
.clone(),
 
Seed::from_base58(BASE58_SEED_INIT).expect("Wrong data in BASE58_SEED_TEST")
);
);
}
}
#[test]
#[test]
fn test_clear_member_keys() {
fn test_clear_member_keys() {
let key_pairs = DuniterKeyPairs {
let key_pairs = DuniterKeyPairs {
network_keypair: KeyPairEnum::Ed25519(ed25519::KeyPair {
network_keypair: KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
}),
}),
member_keypair: Some(KeyPairEnum::Ed25519(ed25519::KeyPair {
member_keypair: Some(KeyPairEnum::Ed25519(ed25519::Ed25519KeyPair {
privkey: ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
seed: Seed::from_base58(BASE58_SEED_INIT)
.expect("conf : keypairs file : fail to parse network_sec !"),
.expect("conf : keypairs file : fail to parse network_seed !"),
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
pubkey: ed25519::PublicKey::from_base58(BASE58_PUB_INIT)
.expect("conf : keypairs file : fail to parse network_pub !"),
.expect("conf : keypairs file : fail to parse network_pub !"),
})),
})),
@@ -334,11 +335,8 @@ mod tests {
@@ -334,11 +335,8 @@ mod tests {
)
)
);
);
assert_eq!(
assert_eq!(
result_key_pairs.network_keypair.private_key(),
result_key_pairs.network_keypair.seed().clone(),
PrivKey::Ed25519(
Seed::from_base58(BASE58_SEED_INIT).expect("Wrong data in BASE58_SEED_TEST")
ed25519::PrivateKey::from_base58(BASE58_SEC_INIT)
.expect("Wrong data in BASE58_SEC_TEST")
)
);
);
// We expect member key to change
// We expect member key to change
Loading