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

fix to header info for wallet restore (#435)

Browse source
This commit is contained in:
Yeastplume 2017-12-06 12:54:33 +00:00 committed by GitHub
parent 173344471f
commit f7866d9f32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/src/types.rs
View file

@ -15,7 +15,6 @@
use std::sync::Arc; use std::sync::Arc;
use core::{core, global}; use core::{core, global};
use core::core::hash::Hashed; use core::core::hash::Hashed;
use core::core::target::Difficulty;
use chain; use chain;
use util::secp::pedersen; use util::secp::pedersen;
use rest::*; use rest::*;
@ -285,9 +284,9 @@ pub struct BlockHeaderInfo {
/// Nonce increment used to mine this block. /// Nonce increment used to mine this block.
pub nonce: u64, pub nonce: u64,
/// Difficulty used to mine the block. /// Difficulty used to mine the block.
pub difficulty: Difficulty, pub difficulty: u64,
/// Total accumulated difficulty since genesis block /// Total accumulated difficulty since genesis block
pub total_difficulty: Difficulty, pub total_difficulty: u64,
} }
impl BlockHeaderInfo { impl BlockHeaderInfo {
@ -302,8 +301,8 @@ impl BlockHeaderInfo {
range_proof_root: util::to_hex(h.range_proof_root.to_vec()), range_proof_root: util::to_hex(h.range_proof_root.to_vec()),
kernel_root: util::to_hex(h.kernel_root.to_vec()), kernel_root: util::to_hex(h.kernel_root.to_vec()),
nonce: h.nonce, nonce: h.nonce,
difficulty: h.difficulty.clone(), difficulty: h.difficulty.into_num(),
total_difficulty: h.total_difficulty.clone(), total_difficulty: h.total_difficulty.into_num()
} }
} }
} }