Skip to content

Commit

Permalink
Update cardano-deps to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
NicolasDP committed Feb 20, 2019
1 parent 37dfb34 commit 77f6d92
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
2 changes: 1 addition & 1 deletion cardano-deps
5 changes: 2 additions & 3 deletions src/handlers/genesis.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{str::FromStr, sync::Arc};

use cardano::block;
use exe_common::genesis_data;
use exe_common::genesisdata;
use iron;
use iron::{IronResult, Request, Response};
use iron::status;
Expand Down Expand Up @@ -65,8 +65,7 @@ impl iron::Handler for Handler {
};

info!("Searching genesis: {}", header_hash);
let genesis_data =
genesis_data::get_genesis_data(&header_hash);
let genesis_data = genesisdata::data::get_genesis_data(&header_hash);

match genesis_data {
Err(hh) => {
Expand Down
3 changes: 1 addition & 2 deletions src/handlers/utxos.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use cardano_storage::chain_state;
use exe_common::genesis_data;
use exe_common::genesisdata;

use std::sync::Arc;
Expand Down Expand Up @@ -36,7 +35,7 @@ impl iron::Handler for Handler {

let mut res = vec![];

let genesis_str = genesis_data::get_genesis_data(&net.config.genesis_prev).unwrap();
let genesis_str = genesisdata::data::get_genesis_data(&net.config.genesis_prev).unwrap();
let genesis_data = genesisdata::parse::parse(genesis_str.as_bytes());

let last_hdr =
Expand Down
3 changes: 1 addition & 2 deletions src/handlers/utxos_delta.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use cardano_storage::chain_state;
use exe_common::genesis_data;
use exe_common::genesisdata;

use std::sync::Arc;
Expand Down Expand Up @@ -44,7 +43,7 @@ impl iron::Handler for Handler {

let mut res = vec![];

let genesis_str = genesis_data::get_genesis_data(&net.config.genesis_prev).unwrap();
let genesis_str = genesisdata::data::get_genesis_data(&net.config.genesis_prev).unwrap();
let genesis_data = genesisdata::parse::parse(genesis_str.as_bytes());

let last_hdr =
Expand Down
7 changes: 3 additions & 4 deletions src/service.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use super::config::{Config, Network, Networks};
use super::handlers;
use exe_common::config::net;
use exe_common::genesisdata;
use exe_common::{genesis_data, sync};
use exe_common::{genesisdata, sync};
use iron;
use router::Router;
use std::sync::Arc;
Expand Down Expand Up @@ -65,8 +64,8 @@ fn refresh_network(label: &str, net: &mut Network) {
let net_cfg = net::Config::from_file(&netcfg_file).expect("no network config present");

let genesis_data = {
let genesis_data =
genesis_data::get_genesis_data(&net_cfg.genesis_prev).expect("genesis data not found");
let genesis_data = genesisdata::data::get_genesis_data(&net_cfg.genesis_prev)
.expect("genesis data not found");
genesisdata::parse::parse(genesis_data.as_bytes())
};

Expand Down

0 comments on commit 77f6d92

Please sign in to comment.