diff --git a/Cargo.lock b/Cargo.lock index 54128544c7..87aedcd875 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12216,7 +12216,6 @@ dependencies = [ "rand 0.8.5", "rand_core 0.6.4", "serde", - "serde_derive", "starcoin-config", "starcoin-crypto", "starcoin-executor", diff --git a/Cargo.toml b/Cargo.toml index 346a6e484b..f8fc6fa6ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -480,12 +480,11 @@ rustyline-derive = "0.6.0" sc-peerset = { path = "network-p2p/peerset" } schemars = { git = "https://github.com/starcoinorg/schemars", rev = "9b3705780b8fe9c8676ff82919869ba7405b1062" } scmd = { path = "commons/scmd" } -serde = "1.0.130" +serde = { version = "1.0.130", features = ["derive"] } serde-generate = { git = "https://github.com/starcoinorg/serde-reflection", rev = "eb95fd4e3b67e08d71432b522c53833a0b855d80" } serde-helpers = { path = "commons/serde-helpers" } serde-reflection = { git = "https://github.com/starcoinorg/serde-reflection", rev = "eb95fd4e3b67e08d71432b522c53833a0b855d80" } serde_bytes = "0.11" -serde_derive = "1.0" serde_json = "~1" serde_yaml = "0.8.26" serde_with = "3.4.0" diff --git a/txpool/Cargo.toml b/txpool/Cargo.toml index 5002e23b2d..fe88dc0f9f 100644 --- a/txpool/Cargo.toml +++ b/txpool/Cargo.toml @@ -11,7 +11,6 @@ parking_lot = { workspace = true } rand = { workspace = true } rand_core = { default-features = false, workspace = true } serde = { workspace = true } -serde_derive = { workspace = true } starcoin-config = { workspace = true } starcoin-crypto = { workspace = true } starcoin-executor = { workspace = true } diff --git a/vm/framework/src/built_package.rs b/vm/framework/src/built_package.rs index e40cec1ef6..73ba5c0d52 100644 --- a/vm/framework/src/built_package.rs +++ b/vm/framework/src/built_package.rs @@ -5,8 +5,8 @@ use crate::{ docgen::DocgenOptions, extended_checks, natives::code::{ModuleMetadata, MoveOption, PackageDep, PackageMetadata, UpgradePolicy}, - zip_metadata, zip_metadata_str, RuntimeModuleMetadataV1, STARCOIN_METADATA_KEY, - STARCOIN_METADATA_KEY_V1, METADATA_V1_MIN_FILE_FORMAT_VERSION, + zip_metadata, zip_metadata_str, RuntimeModuleMetadataV1, METADATA_V1_MIN_FILE_FORMAT_VERSION, + STARCOIN_METADATA_KEY, STARCOIN_METADATA_KEY_V1, }; use anyhow::{anyhow, bail}; use clap::Parser; diff --git a/vm/framework/tests/move_unit_test.rs b/vm/framework/tests/move_unit_test.rs index 9d4f138d7b..cd3e70187c 100644 --- a/vm/framework/tests/move_unit_test.rs +++ b/vm/framework/tests/move_unit_test.rs @@ -2,7 +2,6 @@ // Parts of the project are originally copyright © Meta Platforms, Inc. // SPDX-License-Identifier: Apache-2.0 -use starcoin_vm::natives; use move_cli::base::test::{run_move_unit_tests, UnitTestResult}; use move_command_line_common::env::get_move_compiler_v2_from_env; use move_model::metadata::CompilerVersion; @@ -11,6 +10,7 @@ use move_unit_test::UnitTestingConfig; use move_vm_runtime::native_functions::NativeFunctionTable; use starcoin_framework::{extended_checks, path_in_crate}; use starcoin_gas_schedule::{MiscGasParameters, NativeGasParameters, LATEST_GAS_FEATURE_VERSION}; +use starcoin_vm::natives; use starcoin_vm_types::on_chain_config::{ starcoin_test_feature_flags_genesis, Features, TimedFeaturesBuilder, }; diff --git a/vm/starcoin-sdk-builder/src/common.rs b/vm/starcoin-sdk-builder/src/common.rs index 3a1a380915..2551a7b222 100644 --- a/vm/starcoin-sdk-builder/src/common.rs +++ b/vm/starcoin-sdk-builder/src/common.rs @@ -129,7 +129,9 @@ pub(crate) fn mangle_type(type_tag: &TypeTag) -> String { } } -pub(crate) fn get_external_definitions(starcoin_types: &str) -> serde_generate::ExternalDefinitions { +pub(crate) fn get_external_definitions( + starcoin_types: &str, +) -> serde_generate::ExternalDefinitions { let definitions = vec![( starcoin_types, vec!["AccountAddress", "TypeTag", "Script", "TransactionArgument"], diff --git a/vm/starcoin-sdk-builder/src/golang.rs b/vm/starcoin-sdk-builder/src/golang.rs index 59dada7ceb..8caf40cdb4 100644 --- a/vm/starcoin-sdk-builder/src/golang.rs +++ b/vm/starcoin-sdk-builder/src/golang.rs @@ -122,7 +122,8 @@ where crate::common::get_external_definitions(&starcoin_types_package); // We need BCS for argument encoding and decoding external_definitions.insert( - "github.com/starcoin-labs/serde-reflection/serde-generate/runtime/golang/bcs".to_string(), + "github.com/starcoin-labs/serde-reflection/serde-generate/runtime/golang/bcs" + .to_string(), Vec::new(), ); // Add standard imports diff --git a/vm/starcoin-sdk-builder/src/main.rs b/vm/starcoin-sdk-builder/src/main.rs index fa2d1b2884..a6d44906e5 100644 --- a/vm/starcoin-sdk-builder/src/main.rs +++ b/vm/starcoin-sdk-builder/src/main.rs @@ -19,7 +19,10 @@ enum Language { } #[derive(Debug, Parser)] -#[clap(name = "Starcoin SDK Builder", about = "Generate boilerplate Starcoin SDKs")] +#[clap( + name = "Starcoin SDK Builder", + about = "Generate boilerplate Starcoin SDKs" +)] struct Options { /// Path to the directory containing ABI files in BCS encoding. abi_directories: Vec, diff --git a/vm/starcoin-sdk-builder/tests/generation.rs b/vm/starcoin-sdk-builder/tests/generation.rs index 234e206acb..66efb70d37 100644 --- a/vm/starcoin-sdk-builder/tests/generation.rs +++ b/vm/starcoin-sdk-builder/tests/generation.rs @@ -2,11 +2,11 @@ // Parts of the project are originally copyright © Meta Platforms, Inc. // SPDX-License-Identifier: Apache-2.0 -use starcoin_sdk_builder as buildgen; -use starcoin_types::transaction::EntryABI; use serde_generate as serdegen; use serde_generate::SourceInstaller as _; use serde_reflection::Registry; +use starcoin_sdk_builder as buildgen; +use starcoin_types::transaction::EntryABI; use std::{io::Write, process::Command}; use tempfile::tempdir;