Skip to content

chore: replace deprecated paste crate with pastey #6202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LesnyRumcajs merged 1 commit into from
Oct 28, 2025
Merged

chore: replace deprecated paste crate with pastey #6202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ futures = { workspace = true }
fvm2 = { package = "fvm", version = "~2.11", default-features = false }
fvm3 = { package = "fvm", version = "~3.13", default-features = false }
fvm4 = { package = "fvm", version = "~4.7", default-features = false, features = ["verify-signature", "nv28-dev"] }
fvm_actor_utils = "14"
fvm_ipld_blockstore = "0.3.1"
fvm_ipld_encoding = "0.5.3"
fvm_shared2 = { package = "fvm_shared", version = "~2.11" }
Expand Down Expand Up @@ -160,6 +161,7 @@ nunny = { version = "0.2", features = ["serde", "quickcheck", "schemars1"] }
openrpc-types = "0.5"
parity-db = { version = "0.5" }
parking_lot = { version = "0.12", features = ["deadlock_detection"] }
pastey = "0.1"
pathfinding = "4"
pin-project-lite = "0.2"
positioned-io = "0.3"
Expand Down Expand Up @@ -223,8 +225,6 @@ zstd = "0.13"

# optional dependencies
console-subscriber = { version = "0.4", features = ["parking_lot"], optional = true }
fvm_actor_utils = "14.0.0"
Copy link
Copy Markdown
Contributor Author

@hanabi1224 hanabi1224 Oct 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These 2 do not belong to the optional section

paste = "1"
tikv-jemallocator = { version = "0.6", optional = true }
tracing-chrome = { version = "0.7", optional = true }
tracing-loki = { version = "0.2", default-features = false, features = ["compat-0-2-1", "rustls"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/account_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use super::*;
use crate::shim::address::Address;
use jsonrpsee::core::Serialize;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::Deserialize;

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/cron_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use super::*;
use crate::shim::actors::cron::Entry;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/eam_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use super::*;
use fvm_ipld_encoding::RawBytes;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/evm_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::rpc::eth::types::GetStorageAtParams;
use crate::shim::econ::TokenAmount;
use ::cid::Cid;
use fvm_ipld_encoding::RawBytes;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use std::fmt::Debug;
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/init_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use super::*;
use ::cid::Cid;
use fvm_ipld_encoding::RawBytes;
use jsonrpsee::core::Serialize;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::Deserialize;
use std::fmt::Debug;
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/market_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::test_snapshots;
use fil_actors_shared::fvm_ipld_bitfield::BitField;

use ::cid::Cid;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use std::fmt::Debug;
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/miner_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use fvm_ipld_encoding::{BytesDe, RawBytes};
use fvm_shared4::deal::DealID;
use fvm_shared4::sector::RegisteredUpdateProof;
use num::BigInt;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/multisig_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use crate::shim::clock::ChainEpoch;
use crate::shim::econ::TokenAmount;
use crate::shim::message::MethodNum;
use fvm_ipld_encoding::RawBytes;
use paste::paste;
use pastey::paste;
use serde::{Deserialize, Serialize};

// ConstructorParams
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/paych_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::shim::address::Address;
use crate::shim::clock::ChainEpoch;
use crate::shim::econ::TokenAmount;
use fvm_ipld_encoding::RawBytes;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/power_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use crate::shim::sector::RegisteredPoStProof;
use fvm_ipld_encoding::{BytesDe, RawBytes};
use fvm_shared4::ActorID;
use num::BigInt;
use paste::paste;
use pastey::paste;
use serde::{Deserialize, Serialize};

#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/reward_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use super::*;
use crate::shim::address::Address;
use crate::shim::econ::TokenAmount;
use num_bigint::BigInt;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/params/verified_reg_params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use crate::shim::sector::SectorNumber;
use ::cid::Cid;
use fvm_ipld_encoding::RawBytes;
use fvm_shared4::{ActorID, bigint::BigInt};
use paste::paste;
use pastey::paste;
use serde::{Deserialize, Serialize};

#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/states/evm_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use super::*;
use crate::shim::actors::evm::{State, TombstoneState};
use ::cid::Cid;
use paste::paste;
use pastey::paste;

#[derive(Debug, Serialize, Deserialize, JsonSchema)]
#[serde(rename_all = "PascalCase")]
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/actors/states/vesting_funds.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use super::*;
use crate::shim::{clock::ChainEpoch, econ::TokenAmount};
use ::cid::Cid;
use paste::paste;
use pastey::paste;

// Single LotusJson struct for VestingFund (used by all versions)
#[derive(Debug, Serialize, Deserialize, JsonSchema, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/bytecode_hash.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0, MIT

use super::*;
use paste::paste;
use pastey::paste;

#[derive(Debug, Serialize, Deserialize, JsonSchema)]
#[serde(rename_all = "PascalCase")]
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/filter_estimate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use super::*;
use num::BigInt;
use paste::paste;
use pastey::paste;

#[derive(Debug, Serialize, Deserialize, JsonSchema)]
#[serde(rename_all = "PascalCase")]
Expand Down
4 changes: 2 additions & 2 deletions src/lotus_json/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ pub use vec::*;
macro_rules! test_snapshots {
($module:path: $ty:ident: $($version:literal),+ $(,)?) => {
$(
paste::paste! {
pastey::paste! {
#[test]
fn [<snapshots_ $module _v $version _ $ty:lower>]() {
use super::*;
Expand All @@ -260,7 +260,7 @@ macro_rules! test_snapshots {

($module:path: $nested_path:path: $ty:ident: $($version:literal),+ $(,)?) => {
$(
paste::paste! {
pastey::paste! {
#[test]
fn [<snapshots_ $module _v $version _ $ty:lower>]() {
use super::*;
Expand Down
2 changes: 1 addition & 1 deletion src/lotus_json/transient_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use super::*;
use ::cid::Cid;
use fvm_shared4::ActorID;
use paste::paste;
use pastey::paste;

#[derive(Debug, Serialize, Deserialize, JsonSchema)]
#[serde(rename_all = "PascalCase")]
Expand Down
2 changes: 1 addition & 1 deletion src/rpc/registry/actors/verified_reg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::shim::address::Address;
use crate::shim::message::MethodNum;
use cid::Cid;
use fil_actors_shared::actor_versions::ActorVersion;
use paste::paste;
use pastey::paste;

// Core methods present in all versions
macro_rules! register_core_methods {
Expand Down
2 changes: 1 addition & 1 deletion src/shim/actors/state_load.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright 2019-2025 ChainSafe Systems
// SPDX-License-Identifier: Apache-2.0, MIT
use cid::Cid;
use paste::paste;
use pastey::paste;

use super::version::*;
use fvm_ipld_blockstore::Blockstore;
Expand Down
2 changes: 1 addition & 1 deletion src/shim/actors/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use crate::utils::multihash::prelude::*;
use cid::Cid;
use fil_actors_shared::v11::runtime::builtins::Type;
use paste::paste;
use pastey::paste;
use std::sync::LazyLock;

macro_rules! impl_actor_cids_type_actor {
Expand Down
2 changes: 1 addition & 1 deletion src/shim/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use super::fvm_shared_latest::version::NetworkVersion as NetworkVersion_latest;
pub use fvm_shared2::version::NetworkVersion as NetworkVersion_v2;
use fvm_shared3::version::NetworkVersion as NetworkVersion_v3;
use fvm_shared4::version::NetworkVersion as NetworkVersion_v4;
use paste::paste;
use pastey::paste;
use schemars::JsonSchema;
use serde::{Deserialize, Serialize};

Expand Down
Loading