Skip to content

Commit

Permalink
Merge branch 'wrap-sigs' of git://github.com/okdistribute/hypercore-1…
Browse files Browse the repository at this point in the history
… into okdistribute-wrap-sigs
  • Loading branch information
bltavares committed May 17, 2020
2 parents 5151a33 + 9f96cc6 commit 6f2dbaf
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/crypto/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ mod key_pair;
mod merkle;

pub use self::hash::Hash;
pub use self::key_pair::{generate as generate_keypair, sign, verify, Signature};
pub use self::key_pair::{generate as generate_keypair, sign, verify, PublicKey, SecretKey, Signature};
pub use self::merkle::Merkle;
3 changes: 1 addition & 2 deletions src/feed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ pub use crate::storage::{Node, NodeTrait, Storage, Store};

use crate::audit::Audit;
use crate::bitfield::Bitfield;
use crate::crypto::{generate_keypair, sign, verify, Hash, Merkle};
use crate::crypto::{generate_keypair, sign, verify, Hash, Merkle, PublicKey, SecretKey, Signature};
use crate::proof::Proof;
use anyhow::{bail, ensure, Result};
use ed25519_dalek::{PublicKey, SecretKey, Signature};
use flat_tree as flat;
use pretty_hash::fmt as pretty_fmt;
use random_access_disk::RandomAccessDisk;
Expand Down

0 comments on commit 6f2dbaf

Please sign in to comment.