Add last_id to Event timestamp/signature constructors
This commit is contained in:
parent
ecb3dbbb60
commit
7f647a93da
|
@ -154,8 +154,8 @@ mod tests {
|
||||||
|
|
||||||
// First, verify entries
|
// First, verify entries
|
||||||
let keypair = KeyPair::new();
|
let keypair = KeyPair::new();
|
||||||
let tr0 = Event::new_timestamp(&keypair, Utc::now());
|
let tr0 = Event::new_timestamp(&keypair, Utc::now(), zero);
|
||||||
let tr1 = Event::new_signature(&keypair, Default::default());
|
let tr1 = Event::new_signature(&keypair, Default::default(), zero);
|
||||||
let mut e0 = Entry::new(&zero, 0, vec![tr0.clone(), tr1.clone()]);
|
let mut e0 = Entry::new(&zero, 0, vec![tr0.clone(), tr1.clone()]);
|
||||||
assert!(e0.verify(&zero));
|
assert!(e0.verify(&zero));
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ impl Event {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create and sign a new Witness Timestamp. Used for unit-testing.
|
/// Create and sign a new Witness Timestamp. Used for unit-testing.
|
||||||
pub fn new_timestamp(from: &KeyPair, dt: DateTime<Utc>) -> Self {
|
pub fn new_timestamp(from: &KeyPair, dt: DateTime<Utc>, _last_id: Hash) -> Self {
|
||||||
let sign_data = serialize(&dt).expect("serialize 'dt' in pub fn new_timestamp");
|
let sign_data = serialize(&dt).expect("serialize 'dt' in pub fn new_timestamp");
|
||||||
let sig = Signature::clone_from_slice(from.sign(&sign_data).as_ref());
|
let sig = Signature::clone_from_slice(from.sign(&sign_data).as_ref());
|
||||||
Event::Timestamp {
|
Event::Timestamp {
|
||||||
|
@ -45,7 +45,7 @@ impl Event {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Create and sign a new Witness Signature. Used for unit-testing.
|
/// Create and sign a new Witness Signature. Used for unit-testing.
|
||||||
pub fn new_signature(from: &KeyPair, tx_sig: Signature) -> Self {
|
pub fn new_signature(from: &KeyPair, tx_sig: Signature, _last_id: Hash) -> Self {
|
||||||
let sig = Signature::clone_from_slice(from.sign(&tx_sig).as_ref());
|
let sig = Signature::clone_from_slice(from.sign(&tx_sig).as_ref());
|
||||||
Event::Signature {
|
Event::Signature {
|
||||||
from: from.pubkey(),
|
from: from.pubkey(),
|
||||||
|
@ -75,7 +75,8 @@ mod tests {
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_event_verify() {
|
fn test_event_verify() {
|
||||||
assert!(Event::new_timestamp(&KeyPair::new(), Utc::now()).verify());
|
let zero = Hash::default();
|
||||||
assert!(Event::new_signature(&KeyPair::new(), Signature::default()).verify());
|
assert!(Event::new_timestamp(&KeyPair::new(), Utc::now(), zero).verify());
|
||||||
|
assert!(Event::new_signature(&KeyPair::new(), Signature::default(), zero).verify());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,7 +249,7 @@ pub mod tests {
|
||||||
w.set_index(i).unwrap();
|
w.set_index(i).unwrap();
|
||||||
w.set_id(leader_id).unwrap();
|
w.set_id(leader_id).unwrap();
|
||||||
|
|
||||||
let tr0 = Event::new_timestamp(&bob_keypair, Utc::now());
|
let tr0 = Event::new_timestamp(&bob_keypair, Utc::now(), cur_hash);
|
||||||
let entry0 = Entry::new(&cur_hash, i, vec![tr0]);
|
let entry0 = Entry::new(&cur_hash, i, vec![tr0]);
|
||||||
bank.register_entry_id(&cur_hash);
|
bank.register_entry_id(&cur_hash);
|
||||||
cur_hash = hash(&cur_hash);
|
cur_hash = hash(&cur_hash);
|
||||||
|
|
Loading…
Reference in New Issue