From f39e74f0d71a71803794a91c9c33a89c9facf30b Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Fri, 21 Jun 2019 17:23:26 -0700 Subject: [PATCH] serde the full FeeCalculator (#4778) automerge --- core/src/rpc.rs | 2 ++ sdk/src/fee_calculator.rs | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/rpc.rs b/core/src/rpc.rs index fc0440d782..1f02110520 100644 --- a/core/src/rpc.rs +++ b/core/src/rpc.rs @@ -768,6 +768,8 @@ mod tests { "jsonrpc": "2.0", "result": [ blockhash.to_string(), { "lamportsPerSignature": 0, + "maxLamportsPerSignature": 0, + "minLamportsPerSignature": 0, "targetLamportsPerSignature": 0, "targetSignaturesPerSlot": 0 }], diff --git a/sdk/src/fee_calculator.rs b/sdk/src/fee_calculator.rs index b172ca062d..fd551fa02f 100644 --- a/sdk/src/fee_calculator.rs +++ b/sdk/src/fee_calculator.rs @@ -17,9 +17,7 @@ pub struct FeeCalculator { // for the next slot. A value of 0 disables lamports_per_signature fee adjustments pub target_signatures_per_slot: usize, - #[serde(skip)] pub min_lamports_per_signature: u64, - #[serde(skip)] pub max_lamports_per_signature: u64, }