From 45c56ed57190349f1856d3258af6c09a24ea1395 Mon Sep 17 00:00:00 2001 From: Hubert Date: Thu, 15 Dec 2022 19:51:32 +0100 Subject: [PATCH] use universal (de)serializer for Policy (#957) --- Cargo.lock | 4 ++++ runtime/Cargo.toml | 1 + runtime/src/runtime/policy.rs | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f02a8dce3..8c33e59f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -831,6 +831,7 @@ dependencies = [ "lazy_static", "log", "multihash", + "num", "num-derive", "num-traits", "paste", @@ -1482,6 +1483,7 @@ dependencies = [ "autocfg", "num-integer", "num-traits", + "serde", ] [[package]] @@ -1491,6 +1493,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" dependencies = [ "num-traits", + "serde", ] [[package]] @@ -1535,6 +1538,7 @@ dependencies = [ "num-bigint", "num-integer", "num-traits", + "serde", ] [[package]] diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml index a4da3ce07..c94fd024d 100644 --- a/runtime/Cargo.toml +++ b/runtime/Cargo.toml @@ -11,6 +11,7 @@ repository = "https://github.com/filecoin-project/builtin-actors" fvm_ipld_hamt = "0.5.1" fvm_ipld_amt = { version = "0.4.2", features = ["go-interop"] } fvm_shared = { version = "2.0.0-alpha.2", default-features = false } +num = { version = "0.4", features = ["serde"] } num-traits = "0.2.14" num-derive = "0.3.3" serde = { version = "1.0.136", features = ["derive"] } diff --git a/runtime/src/runtime/policy.rs b/runtime/src/runtime/policy.rs index 5559433b0..06fbf0ab3 100644 --- a/runtime/src/runtime/policy.rs +++ b/runtime/src/runtime/policy.rs @@ -1,6 +1,5 @@ use std::collections::HashSet; -use fvm_shared::bigint::bigint_ser; use fvm_shared::clock::ChainEpoch; use fvm_shared::sector::{RegisteredPoStProof, RegisteredSealProof, StoragePower}; use num_traits::FromPrimitive; @@ -137,7 +136,6 @@ pub struct Policy { // --- verifreg policy /// Minimum verified deal size - #[serde(with = "bigint_ser")] pub minimum_verified_allocation_size: StoragePower, /// Minimum term for a verified data allocation (epochs) pub minimum_verified_allocation_term: i64, @@ -167,7 +165,6 @@ pub struct Policy { // --- power --- /// Minimum miner consensus power - #[serde(with = "bigint_ser")] pub minimum_consensus_power: StoragePower, }