use Rust macro from the rooch_framework

steelgeek091 · Aug 31, 2024 · 9d8f10c · 9d8f10c
1 parent 6d1a81e
commit 9d8f10c
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 189 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rooch-genesis/src/lib.rs b/crates/rooch-genesis/src/lib.rs
@@ -29,11 +29,6 @@ use rooch_framework::natives::gas_parameter::gas_member::{
 };
 use rooch_framework::ROOCH_FRAMEWORK_ADDRESS;
 use rooch_indexer::store::traits::IndexerStoreTrait;
-use rooch_nursery::natives::gas_parameter::gas_member::InitialGasSchedule as RoochNurseryInitialGasSchedule;
-use rooch_nursery::natives::gas_parameter::gas_member::{
-    FromOnChainGasSchedule as RoochNurseryFromOnChainGasSchedule,
-    ToOnChainGasSchedule as RoochNurseryToOnChainGasSchedule,
-};
 use rooch_store::meta_store::MetaStore;
 use rooch_store::transaction_store::TransactionStore;
 use rooch_types::address::BitcoinAddress;

diff --git a/frameworks/framework-release/released/8/stdlib b/frameworks/framework-release/released/8/stdlib
diff --git a/frameworks/rooch-nursery/Cargo.toml b/frameworks/rooch-nursery/Cargo.toml
@@ -39,4 +39,5 @@ moveos-stdlib = { workspace = true }
 moveos = { workspace = true }
 moveos-wasm = { workspace = true }
 
-rooch-types = { workspace = true }
+rooch-types = { workspace = true }
+rooch-framework = { workspace = true }
diff --git a/frameworks/rooch-nursery/src/natives/gas_parameter/gas_member.rs b/frameworks/rooch-nursery/src/natives/gas_parameter/gas_member.rs
diff --git a/frameworks/rooch-nursery/src/natives/gas_parameter/mod.rs b/frameworks/rooch-nursery/src/natives/gas_parameter/mod.rs
@@ -1,6 +1,4 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-pub mod gas_member;
-pub mod native;
 pub mod wasm;
diff --git a/frameworks/rooch-nursery/src/natives/gas_parameter/native.rs b/frameworks/rooch-nursery/src/natives/gas_parameter/native.rs
diff --git a/frameworks/rooch-nursery/src/natives/gas_parameter/wasm.rs b/frameworks/rooch-nursery/src/natives/gas_parameter/wasm.rs
@@ -3,7 +3,7 @@
 
 use crate::natives::wasm::GasParameters;
 
-crate::natives::gas_parameter::native::define_gas_parameters_for_natives!(GasParameters, "wasm", [
+rooch_framework::natives::gas_parameter::native::define_gas_parameters_for_natives!(GasParameters, "wasm", [
     [.create_instance_gas_parameter.base_create_instance, "create_instance_gas_parameter.base_create_instance", 10000],
     [.create_instance_gas_parameter.per_byte_instance, "create_instance_gas_parameter.per_byte_instance", 100],
 

diff --git a/frameworks/rooch-nursery/src/natives/mod.rs b/frameworks/rooch-nursery/src/natives/mod.rs
@@ -1,10 +1,10 @@
 // Copyright (c) RoochNetwork
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::natives::gas_parameter::gas_member::{
+use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
+use rooch_framework::natives::gas_parameter::gas_member::{
     FromOnChainGasSchedule, InitialGasSchedule, ToOnChainGasSchedule,
 };
-use move_vm_runtime::native_functions::{make_table_from_iter, NativeFunctionTable};
 use rooch_types::addresses::ROOCH_NURSERY_ADDRESS;
 use std::collections::BTreeMap;