[compiler-v2] fix starcoin config unit test

config/src/account_vault_config.rs

@@ -3,7 +3,7 @@
 
 use crate::{BaseConfig, ConfigModule, StarcoinOpt};
 use anyhow::Result;
-use clap::{value_parser, Parser};
+use clap::Parser;
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
@@ -15,7 +15,7 @@ static G_DEFAULT_DIR: Lazy<PathBuf> = Lazy::new(|| PathBuf::from("account_vaults
 #[serde(deny_unknown_fields)]
 pub struct AccountVaultConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[arg(long = "vault-dir", value_parser = value_parser!(std::ffi::OsString))]
+    #[arg(long = "vault-dir", value_parser)]
     /// Account vault dir config.
     /// Default: account_vaults in data_dir
     dir: Option<PathBuf>,

config/src/genesis_config.rs

@@ -765,7 +765,7 @@ pub static G_DAG_TEST_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         time_mint_period: G_DEFAULT_TIME_LOCKED_PERIOD,
         vm_config: VMConfig {
             gas_schedule: GasSchedule {
-                feature_vesion: LATEST_GAS_FEATURE_VERSION,
+                feature_version: LATEST_GAS_FEATURE_VERSION,
                 entries: StarcoinGasParameters::initial()
                     .to_on_chain_gas_schedule(LATEST_GAS_FEATURE_VERSION),
             },
@@ -820,7 +820,7 @@ pub static G_TEST_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         time_mint_period: G_DEFAULT_TIME_LOCKED_PERIOD,
         vm_config: VMConfig {
             gas_schedule: GasSchedule {
-                feature_vesion: LATEST_GAS_FEATURE_VERSION,
+                feature_version: LATEST_GAS_FEATURE_VERSION,
                 entries: StarcoinGasParameters::initial()
                     .to_on_chain_gas_schedule(LATEST_GAS_FEATURE_VERSION),
             },
@@ -878,7 +878,7 @@ pub static G_DEV_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         time_mint_period: 3600 * 24,
         vm_config: VMConfig {
             gas_schedule: GasSchedule {
-                feature_vesion: LATEST_GAS_FEATURE_VERSION,
+                feature_version: LATEST_GAS_FEATURE_VERSION,
                 entries: StarcoinGasParameters::initial()
                     .to_on_chain_gas_schedule(LATEST_GAS_FEATURE_VERSION),
             },
@@ -940,7 +940,7 @@ pub static G_HALLEY_CONFIG: Lazy<GenesisConfig> = Lazy::new(|| {
         time_mint_period: 3600 * 24 * 31,
         vm_config: VMConfig {
             gas_schedule: GasSchedule {
-                feature_vesion: LATEST_GAS_FEATURE_VERSION,
+                feature_version: LATEST_GAS_FEATURE_VERSION,
                 entries: StarcoinGasParameters::initial()
                     .to_on_chain_gas_schedule(LATEST_GAS_FEATURE_VERSION),
             },

config/src/lib.rs

@@ -5,7 +5,7 @@ use crate::account_vault_config::AccountVaultConfig;
 use crate::helper::{load_config, save_config};
 use crate::sync_config::SyncConfig;
 use anyhow::{ensure, format_err, Result};
-use clap::{value_parser, Parser};
+use clap::Parser;
 use git_version::git_version;
 use once_cell::sync::Lazy;
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
@@ -182,7 +182,7 @@ pub struct StarcoinOpt {
     pub connect: Option<Connect>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
-    #[arg(long = "data-dir", short = 'd', value_parser = value_parser!(std::ffi::OsString))]
+    #[arg(long = "data-dir", short = 'd', value_parser)]
     /// Path to data dir, this dir is base dir, the final data_dir is base_dir/chain_network_name
     pub base_data_dir: Option<PathBuf>,
 

config/src/tests.rs

@@ -187,3 +187,18 @@ fn test_check_method_in_api_sets() {
     assert!(!ApiSet::UnsafeContext.check_rpc_method("unknown"));
     assert!(!ApiSet::UnsafeContext.check_rpc_method(""));
 }
+
+#[test]
+fn print_all_genesis_config() {
+    for net in BuiltinNetworkID::networks() {
+        if net.is_dev() || net.is_test() || net.is_dag_test() {
+            continue;
+        }
+        let genesis_config = net.genesis_config();
+        println!("genesis config for network: {}", net);
+        println!(
+            "{}\n\n\n",
+            serde_json::to_string_pretty(genesis_config).unwrap()
+        );
+    }
+}

scripts/nextest.sh

@@ -27,6 +27,7 @@ cargo nextest run \
 -p starcoin-vm-runtime \
 -p starcoin-genesis \
 -p starcoin-node \
+-p starcoin-config \
 --retries 2 --build-jobs 8 --test-threads 12 --no-fail-fast --failure-output immediate-final
 
 

vm/starcoin-transactional-test-harness/src/lib.rs

@@ -592,7 +592,7 @@ impl<'a> StarcoinTestAdapter<'a> {
             .gas_schedule;
         let gas_parameters = StarcoinGasParameters::from_on_chain_gas_schedule(
             &gs.clone().to_btree_map(),
-            gs.feature_vesion,
+            gs.feature_version,
         )
         .unwrap();
         let max_number_of_gas_units = gas_parameters.vm.txn.maximum_number_of_gas_units;

vm/types/src/on_chain_config/gas_schedule.rs

@@ -21,7 +21,7 @@ pub static G_GAS_SCHEDULE_GAS_SCHEDULE: Lazy<Identifier> =
 
 #[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
 pub struct GasSchedule {
-    pub feature_vesion: u64,
+    pub feature_version: u64,
     pub entries: Vec<(String, u64)>,
 }
 
@@ -690,7 +690,7 @@ impl From<&CostTable> for GasSchedule {
         append_extra_gas_cost_framework_upgrade(&mut entries);
 
         Self {
-            feature_vesion: 13,
+            feature_version: 13,
             entries,
         }
     }

vm/vm-runtime/src/lib.rs

@@ -93,7 +93,7 @@ pub(crate) fn discard_error_output(err: StatusCode) -> TransactionOutput {
 
 pub(crate) fn default_gas_schedule() -> GasSchedule {
     GasSchedule {
-        feature_vesion: LATEST_GAS_FEATURE_VERSION,
+        feature_version: LATEST_GAS_FEATURE_VERSION,
         entries: StarcoinGasParameters::initial()
             .to_on_chain_gas_schedule(LATEST_GAS_FEATURE_VERSION),
     }

vm/vm-runtime/src/starcoin_vm.rs

@@ -179,7 +179,7 @@ impl StarcoinVM {
                 bail!("failed to load gas schedule!");
             }
             Some(gs) => {
-                let gas_feature_version = gs.feature_vesion;
+                let gas_feature_version = gs.feature_version;
                 let gas_schdule_treemap = gs.clone().to_btree_map();
                 let gas_params = StarcoinGasParameters::from_on_chain_gas_schedule(
                     &gas_schdule_treemap,