Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Last snafu (hopefully)

Browse source
This commit is contained in:
Ignotus Peverell 2017-07-22 23:32:00 +00:00
parent 2261415c27
commit 87fc062f9b
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
grin/tests/framework.rs
View file

@ -20,7 +20,7 @@ extern crate grin_api as api;
extern crate grin_wallet as wallet; extern crate grin_wallet as wallet;
extern crate secp256k1zkp as secp; extern crate secp256k1zkp as secp;
extern crate blake2_rfc as blake2;; extern crate blake2_rfc as blake2;
extern crate env_logger; extern crate env_logger;
extern crate futures; extern crate futures;
extern crate tokio_core; extern crate tokio_core;
@ -35,7 +35,6 @@ use std::fs;
use std::sync::{Arc, Mutex, RwLock}; use std::sync::{Arc, Mutex, RwLock};
use std::ops::Deref; use std::ops::Deref;
use blake2::blake2b::blake2b;
use futures::{Future}; use futures::{Future};
use futures::future::join_all; use futures::future::join_all;
use futures::task::park; use futures::task::park;
@ -269,10 +268,10 @@ impl LocalServerContainer {
//Just use the name of the server for a seed for now //Just use the name of the server for a seed for now
let seed = format!("{}", self.config.name); let seed = format!("{}", self.config.name);
let seed = blake2b(32, &[], seed.as_bytes()); let seed = blake2::blake2b::blake2b(32, &[], seed.as_bytes());
let s = Secp256k1::new(); let s = Secp256k1::new();
let key = wallet::ExtendedKey::from_seed(&s, &seed[..]) let key = wallet::ExtendedKey::from_seed(&s, seed.as_bytes())
.expect("Error deriving extended key from seed."); .expect("Error deriving extended key from seed.");
println!("Starting the Grin wallet receiving daemon on {} ", self.config.wallet_port ); println!("Starting the Grin wallet receiving daemon on {} ", self.config.wallet_port );