Fix fee serialization

ZcashFoundation · Oct 28, 2022 · 3e5e15f · 3e5e15f
1 parent 7f61223
commit 3e5e15f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/zebra-chain/src/amount.rs b/zebra-chain/src/amount.rs
@@ -7,7 +7,6 @@
 
 use std::{
     cmp::Ordering,
-    convert::{TryFrom, TryInto},
     hash::{Hash, Hasher},
     marker::PhantomData,
     ops::RangeInclusive,
@@ -28,7 +27,8 @@ pub type Result<T, E = Error> = std::result::Result<T, E>;
 /// A runtime validated type for representing amounts of zatoshis
 #[derive(Clone, Copy, Serialize, Deserialize)]
 #[serde(try_from = "i64")]
-#[serde(bound = "C: Constraint")]
+#[serde(into = "i64")]
+#[serde(bound = "C: Constraint + Clone")]
 pub struct Amount<C = NegativeAllowed>(
     /// The inner amount value.
     i64,

diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template.rs b/zebra-rpc/src/methods/get_block_template_rpcs/types/get_block_template.rs
@@ -24,18 +24,22 @@ pub struct GetBlockTemplate {
     /// Add documentation.
     #[serde(rename = "previousblockhash")]
     pub previous_block_hash: GetBlockHash,
+
     /// Add documentation.
     #[serde(rename = "blockcommitmentshash")]
     #[serde(with = "hex")]
     pub block_commitments_hash: ChainHistoryBlockTxAuthCommitmentHash,
+
     /// Add documentation.
     #[serde(rename = "lightclientroothash")]
     #[serde(with = "hex")]
     pub light_client_root_hash: ChainHistoryBlockTxAuthCommitmentHash,
+
     /// Add documentation.
     #[serde(rename = "finalsaplingroothash")]
     #[serde(with = "hex")]
     pub final_sapling_root_hash: ChainHistoryBlockTxAuthCommitmentHash,
+
     /// Add documentation.
     #[serde(rename = "defaultroots")]
     pub default_roots: DefaultRoots,

diff --git a/zebra-rpc/src/methods/get_block_template_rpcs/types/transaction.rs b/zebra-rpc/src/methods/get_block_template_rpcs/types/transaction.rs
@@ -8,10 +8,10 @@ use zebra_chain::{
 
 /// Transaction data and fields needed to generate blocks using the `getblocktemplate` RPC.
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize, serde::Deserialize)]
-#[serde(bound = "FeeConstraint: amount::Constraint")]
+#[serde(bound = "FeeConstraint: amount::Constraint + Clone")]
 pub struct TransactionTemplate<FeeConstraint>
 where
-    FeeConstraint: amount::Constraint,
+    FeeConstraint: amount::Constraint + Clone,
 {
     /// The hex-encoded serialized data for this transaction.
     #[serde(with = "hex")]

diff --git a/zebra-rpc/src/methods/tests/snapshot/snapshots/get_block_template@mainnet_10.snap b/zebra-rpc/src/methods/tests/snapshot/snapshots/get_block_template@mainnet_10.snap
@@ -21,9 +21,7 @@ expression: block_template
     "hash": "0000000000000000000000000000000000000000000000000000000000000000",
     "authdigest": "0000000000000000000000000000000000000000000000000000000000000000",
     "depends": [],
-    "fee": [
-      0
-    ],
+    "fee": 0,
     "sigops": 0,
     "required": true
   },

diff --git a/zebra-rpc/src/methods/tests/snapshot/snapshots/get_block_template@testnet_10.snap b/zebra-rpc/src/methods/tests/snapshot/snapshots/get_block_template@testnet_10.snap
@@ -21,9 +21,7 @@ expression: block_template
     "hash": "0000000000000000000000000000000000000000000000000000000000000000",
     "authdigest": "0000000000000000000000000000000000000000000000000000000000000000",
     "depends": [],
-    "fee": [
-      0
-    ],
+    "fee": 0,
     "sigops": 0,
     "required": true
   },