Skip to content

Commit 7cf2a5d

Browse files
authored
fix: api compare tests (#5447)
1 parent 6014d9b commit 7cf2a5d

File tree

3 files changed

+6
-36
lines changed

3 files changed

+6
-36
lines changed

src/rpc/methods/state.rs

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ mod types;
55
use crate::shim::actors::init;
66
use crate::shim::actors::miner::ext::DeadlineExt;
77
use fil_actors_shared::fvm_ipld_amt::Amt;
8-
use fvm_shared3::sector::RegisteredSealProof;
98
use schemars::JsonSchema;
109
use serde::{Deserialize, Serialize};
1110
pub use types::*;
@@ -17,7 +16,7 @@ use crate::eth::EthChainId;
1716
use crate::interpreter::VMEvent;
1817
use crate::libp2p::NetworkMessage;
1918
use crate::lotus_json::lotus_json_with_self;
20-
use crate::networks::{ChainConfig, NetworkChain};
19+
use crate::networks::ChainConfig;
2120
use crate::shim::actors::market::ext::MarketStateExt as _;
2221
use crate::shim::actors::market::DealState;
2322
use crate::shim::actors::state_load::*;
@@ -2760,36 +2759,10 @@ impl RpcMethod<0> for StateGetNetworkParams {
27602759
let config = ctx.chain_config().as_ref();
27612760
let policy = &config.policy;
27622761

2763-
// This is the correct implementation, but for conformance with Lotus,
2764-
// until resolved there, we have to use a workaround. Replace this
2765-
// once a version of Lotus is released with the correct implementation.
2766-
// The change is already in the Lotus master branch.
2767-
//let supported_proof_types = policy
2768-
// .valid_pre_commit_proof_type
2769-
// .iter()
2770-
// .map(|p| i64::from(*p))
2771-
// .sorted()
2772-
// .map(|p| p.into())
2773-
// .collect();
2774-
2775-
use crate::shim::sector::RegisteredSealProofV3::*;
2776-
let supported_proof_types = match config.network {
2777-
NetworkChain::Mainnet | NetworkChain::Calibnet => {
2778-
vec![StackedDRG32GiBV1, StackedDRG64GiBV1]
2779-
}
2780-
NetworkChain::Butterflynet => {
2781-
vec![StackedDRG512MiBV1, StackedDRG32GiBV1, StackedDRG64GiBV1]
2782-
}
2783-
NetworkChain::Devnet(_) => {
2784-
vec![StackedDRG2KiBV1, StackedDRG8MiBV1]
2785-
}
2786-
};
2787-
27882762
let params = NetworkParams {
27892763
network_name: ctx.network_name.clone(),
27902764
block_delay_secs: config.block_delay_secs as u64,
27912765
consensus_miner_min_power: policy.minimum_consensus_power.clone(),
2792-
supported_proof_types,
27932766
pre_commit_challenge_delay: policy.pre_commit_challenge_delay,
27942767
fork_upgrade_params: ForkUpgradeParams::try_from(config)
27952768
.context("Failed to get fork upgrade params")?,
@@ -2808,8 +2781,6 @@ pub struct NetworkParams {
28082781
#[schemars(with = "crate::lotus_json::LotusJson<BigInt>")]
28092782
#[serde(with = "crate::lotus_json")]
28102783
consensus_miner_min_power: BigInt,
2811-
#[schemars(with = "crate::lotus_json::LotusJson<i64>")]
2812-
supported_proof_types: Vec<RegisteredSealProof>,
28132784
pre_commit_challenge_delay: ChainEpoch,
28142785
fork_upgrade_params: ForkUpgradeParams,
28152786
#[serde(rename = "Eip155ChainID")]

src/rpc/types/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,7 @@ pub struct SectorOnChainInfo {
231231
/// `CommR`
232232
pub sealed_cid: Cid,
233233

234-
#[schemars(with = "LotusJson<Vec<DealID>>")]
235-
#[serde(with = "crate::lotus_json", rename = "DealIDs")]
234+
#[serde(skip)]
236235
pub deal_ids: Vec<DealID>,
237236

238237
/// Epoch during which the sector proof was accepted

src/tool/subcommands/api_cmd/test_snapshots.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ filecoin_stategetallocations_1733735082163772.rpcsnap.json.zst
7272
filecoin_stategetbeaconentry_1737546933208724.rpcsnap.json.zst
7373
filecoin_stategetclaim_1737546933208940.rpcsnap.json.zst
7474
filecoin_stategetclaims_1737546933208977.rpcsnap.json.zst
75-
filecoin_stategetnetworkparams_1737546933236396.rpcsnap.json.zst
75+
filecoin_stategetnetworkparams_1742810189749415.rpcsnap.json.zst
7676
filecoin_stategetrandomnessdigestfrombeacon_1737546933236534.rpcsnap.json.zst
7777
filecoin_stategetrandomnessdigestfromtickets_1737546933236558.rpcsnap.json.zst
7878
filecoin_stategetrandomnessfrombeacon_1737546933236581.rpcsnap.json.zst
@@ -86,7 +86,7 @@ filecoin_statemarketbalance_1737021768960382.rpcsnap.json.zst
8686
filecoin_statemarketdeals_1737021771457252.rpcsnap.json.zst
8787
filecoin_statemarketparticipants_1737021768960732.rpcsnap.json.zst
8888
filecoin_statemarketstoragedeal_1737021768962584.rpcsnap.json.zst
89-
filecoin_statemineractivesectors_1737022539110582.rpcsnap.json.zst
89+
filecoin_statemineractivesectors_1742810233639719.rpcsnap.json.zst
9090
filecoin_stateminerallocated_1737022538682774.rpcsnap.json.zst
9191
filecoin_statemineravailablebalance_1737022538683759.rpcsnap.json.zst
9292
filecoin_stateminerdeadlines_1742515166713076.rpcsnap.json.zst
@@ -101,14 +101,14 @@ filecoin_stateminerprovingdeadline_1737022538685431.rpcsnap.json.zst
101101
filecoin_stateminerrecoveries_1737022538685471.rpcsnap.json.zst
102102
filecoin_stateminersectorallocated_1737022538685862.rpcsnap.json.zst
103103
filecoin_stateminersectorcount_1737022538685937.rpcsnap.json.zst
104-
filecoin_stateminersectors_1737022540416166.rpcsnap.json.zst
104+
filecoin_stateminersectors_1742810235169204.rpcsnap.json.zst
105105
filecoin_statenetworkname_1737546933390169.rpcsnap.json.zst
106106
filecoin_statenetworkversion_1737546933390184.rpcsnap.json.zst
107107
filecoin_statereadstate_1737546933390259.rpcsnap.json.zst
108108
filecoin_statesearchmsg_1741784596636715.rpcsnap.json.zst
109109
filecoin_statesearchmsglimited_1741784596704876.rpcsnap.json.zst
110110
filecoin_statesectorexpiration_1741784727996672.rpcsnap.json.zst
111-
filecoin_statesectorgetinfo_1737546933391033.rpcsnap.json.zst
111+
filecoin_statesectorgetinfo_1742810233440470.rpcsnap.json.zst
112112
filecoin_statesectorpartition_1737546933391247.rpcsnap.json.zst
113113
filecoin_statesectorprecommitinfo_1737546933391304.rpcsnap.json.zst
114114
filecoin_stateverifiedclientstatus_1737546933391465.rpcsnap.json.zst

0 commit comments

Comments
 (0)