Skip to content

Commit

Permalink
[1.1.0] Serialize Blockfees struct consistenly with grin-wallet (#2717)
Browse files Browse the repository at this point in the history
* ser blockfees consistently with grin-wallet

* rustfmt
  • Loading branch information
yeastplume authored Mar 29, 2019
1 parent 1dd9a87 commit bd6c734
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions servers/src/mining/mine_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use crate::chain;
use crate::common::types::Error;
use crate::core::core::verifier_cache::VerifierCache;
use crate::core::core::{Output, TxKernel};
use crate::core::libtx::secp_ser;
use crate::core::{consensus, core, global};
use crate::keychain::{ExtKeychain, Identifier, Keychain};
use crate::pool;
Expand All @@ -36,8 +37,10 @@ use crate::pool;
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct BlockFees {
/// fees
#[serde(with = "secp_ser::string_or_u64")]
pub fees: u64,
/// height
#[serde(with = "secp_ser::string_or_u64")]
pub height: u64,
/// key id
pub key_id: Option<Identifier>,
Expand Down

0 comments on commit bd6c734

Please sign in to comment.