Sha256Hash -> Hash

Because in Loom, there's just the one. Hopefully no worries that it
shares a name with std::Hash.
This commit is contained in:
Greg Fitzgerald
2018-03-06 17:36:45 -07:00
parent 1436bb1ff2
commit b725fdb093
12 changed files with 65 additions and 84 deletions

View File

@ -7,7 +7,7 @@ use std::io;
use bincode::{deserialize, serialize};
use transaction::Transaction;
use signature::{PublicKey, Signature};
use hash::Sha256Hash;
use hash::Hash;
use entry::Entry;
use ring::signature::Ed25519KeyPair;
use accountant_skel::{Request, Response};
@ -15,7 +15,7 @@ use accountant_skel::{Request, Response};
pub struct AccountantStub {
pub addr: String,
pub socket: UdpSocket,
pub last_id: Option<Sha256Hash>,
pub last_id: Option<Hash>,
}
impl AccountantStub {
@ -38,7 +38,7 @@ impl AccountantStub {
n: i64,
keypair: &Ed25519KeyPair,
to: PublicKey,
last_id: &Sha256Hash,
last_id: &Hash,
) -> io::Result<Signature> {
let tr = Transaction::new(keypair, to, n, *last_id);
let sig = tr.sig;
@ -59,7 +59,7 @@ impl AccountantStub {
Ok(None)
}
fn get_id(&self, is_last: bool) -> io::Result<Sha256Hash> {
fn get_id(&self, is_last: bool) -> io::Result<Hash> {
let req = Request::GetId { is_last };
let data = serialize(&req).expect("serialize GetId");
self.socket.send_to(&data, &self.addr)?;
@ -72,7 +72,7 @@ impl AccountantStub {
Ok(Default::default())
}
pub fn get_last_id(&self) -> io::Result<Sha256Hash> {
pub fn get_last_id(&self) -> io::Result<Hash> {
self.get_id(true)
}