remove useless code

axonweb3 · Oct 8, 2023 · ec70653 · ec70653
1 parent 1516853
commit ec70653
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 105 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/builtin-contract/system-contract/contracts/metadata/Metadata.sol b/builtin-contract/system-contract/contracts/metadata/Metadata.sol
@@ -37,7 +37,6 @@ library MetadataType {
         uint64 tx_num_limit;
         uint64 max_tx_size;
         uint64 gas_limit;
-        uint64 gas_price;
         uint64 interval;
     }
 

diff --git a/core/executor/Cargo.toml b/core/executor/Cargo.toml
@@ -42,6 +42,7 @@ common-crypto = { path = "../../common/crypto" }
 core-rpc-client = { path = "../rpc-client" }
 core-storage = { path = "../storage" }
 criterion = "0.5"
+env_logger = "0.10"
 ethabi = "18.0"
 ethabi-contract = { git = "https://github.com/rust-ethereum/ethabi.git", rev = "7edf185" }
 ethabi-derive = { git = "https://github.com/rust-ethereum/ethabi.git", rev = "7edf185" }

diff --git a/core/executor/src/precompiles/metadata.rs b/core/executor/src/precompiles/metadata.rs
diff --git a/core/executor/src/precompiles/mod.rs b/core/executor/src/precompiles/mod.rs
@@ -7,7 +7,6 @@ mod ecrecover;
 mod get_cell;
 mod get_header;
 mod identity;
-mod metadata;
 mod modexp;
 mod ripemd160;
 mod rsa;

diff --git a/core/executor/src/system_contract/metadata/abi/metadata_abi.json b/core/executor/src/system_contract/metadata/abi/metadata_abi.json
@@ -111,11 +111,6 @@
                 "name": "gas_limit",
                 "type": "uint64"
               },
-              {
-                "internalType": "uint64",
-                "name": "gas_price",
-                "type": "uint64"
-              },
               {
                 "internalType": "uint64",
                 "name": "interval",
@@ -221,11 +216,6 @@
             "name": "gas_limit",
             "type": "uint64"
           },
-          {
-            "internalType": "uint64",
-            "name": "gas_price",
-            "type": "uint64"
-          },
           {
             "internalType": "uint64",
             "name": "interval",

diff --git a/core/executor/src/system_contract/metadata/abi/metadata_abi.rs b/core/executor/src/system_contract/metadata/abi/metadata_abi.rs
diff --git a/core/executor/src/system_contract/metadata/abi/mod.rs b/core/executor/src/system_contract/metadata/abi/mod.rs
@@ -42,7 +42,6 @@ impl From<ConsensusConfig> for metadata_abi::ConsensusConfig {
             tx_num_limit:    value.tx_num_limit,
             max_tx_size:     value.max_tx_size,
             gas_limit:       value.gas_limit,
-            gas_price:       value.gas_price,
             interval:        value.interval,
         }
     }
@@ -58,7 +57,6 @@ impl From<metadata_abi::ConsensusConfig> for ConsensusConfig {
             tx_num_limit:    value.tx_num_limit,
             max_tx_size:     value.max_tx_size,
             gas_limit:       value.gas_limit,
-            gas_price:       value.gas_price,
             interval:        value.interval,
         }
     }

diff --git a/core/executor/src/tests/system_script/metadata.rs b/core/executor/src/tests/system_script/metadata.rs
@@ -22,6 +22,7 @@ static ROCKSDB_PATH: &str = "./free-space/system-contract/metadata";
 
 #[test]
 fn test_write_functions() {
+    env_logger::init();
     let vicinity = gen_vicinity();
     let mut backend = MemoryBackend::new(&vicinity, BTreeMap::new());
 
@@ -47,6 +48,7 @@ fn test_init<'a>(backend: &mut MemoryBackend<'a>, executor: &MetadataContract<Me
     let addr = H160::from_str("0xf000000000000000000000000000000000000000").unwrap();
     let tx = prepare_tx_1(&addr);
     let r = executor.exec_(backend, &tx);
+    println!("{:?}", r);
     assert!(r.exit_reason.is_succeed());
 }
 
@@ -185,7 +187,6 @@ fn prepare_metadata() -> Metadata {
         propose_counter:  vec![],
         consensus_config: ConsensusConfig {
             gas_limit:       1u64,
-            gas_price:       0u64,
             interval:        0u64,
             propose_ratio:   1u64,
             prevote_ratio:   1u64,

diff --git a/protocol/src/types/block.rs b/protocol/src/types/block.rs
@@ -362,7 +362,6 @@ mod tests {
             }],
             consensus_config: ConsensusConfig {
                 gas_limit: 4294967295,
-                gas_price: 1,
                 interval: 3000,
                 propose_ratio: 15,
                 prevote_ratio: 10,

diff --git a/protocol/src/types/primitive.rs b/protocol/src/types/primitive.rs
@@ -313,8 +313,6 @@ pub struct ConsensusConfig {
     #[cfg_attr(feature = "hex-serialize", serde(serialize_with = "serialize_uint"))]
     pub gas_limit:       u64,
     #[cfg_attr(feature = "hex-serialize", serde(serialize_with = "serialize_uint"))]
-    pub gas_price:       u64,
-    #[cfg_attr(feature = "hex-serialize", serde(serialize_with = "serialize_uint"))]
     pub interval:        u64,
     #[cfg_attr(feature = "hex-serialize", serde(serialize_with = "serialize_uint"))]
     pub propose_ratio:   u64,