Skip to content

Commit 5ed4e00

Browse files
committed
[gas] abstract gas algebra part 2 -- move algebra & gas params into separate crates
1 parent d78bb49 commit 5ed4e00

File tree

58 files changed

+859
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+859
-635
lines changed

Cargo.lock

Lines changed: 31 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ members = [
99
"aptos-move/aptos-aggregator",
1010
"aptos-move/aptos-debugger",
1111
"aptos-move/aptos-gas",
12+
"aptos-move/aptos-gas-algebra",
1213
"aptos-move/aptos-gas-profiling",
14+
"aptos-move/aptos-gas-schedule",
1315
"aptos-move/aptos-memory-usage-tracker",
1416
"aptos-move/aptos-release-builder",
1517
"aptos-move/aptos-resource-viewer",
@@ -28,7 +30,6 @@ members = [
2830
"aptos-move/e2e-testsuite",
2931
"aptos-move/framework",
3032
"aptos-move/framework/cached-packages",
31-
"aptos-move/gas-algebra-ext",
3233
"aptos-move/move-examples",
3334
"aptos-move/mvhashmap",
3435
"aptos-move/package-builder",
@@ -297,8 +298,9 @@ aptos-framework = { path = "aptos-move/framework" }
297298
aptos-fuzzer = { path = "testsuite/aptos-fuzzer" }
298299
fuzzer = { path = "testsuite/fuzzer" }
299300
aptos-gas = { path = "aptos-move/aptos-gas" }
300-
aptos-gas-algebra-ext = { path = "aptos-move/gas-algebra-ext" }
301+
aptos-gas-algebra = { path = "aptos-move/aptos-gas-algebra" }
301302
aptos-gas-profiling = { path = "aptos-move/aptos-gas-profiling" }
303+
aptos-gas-schedule = { path = "aptos-move/aptos-gas-schedule" }
302304
aptos-genesis = { path = "crates/aptos-genesis" }
303305
aptos-github-client = { path = "crates/aptos-github-client" }
304306
aptos-global-constants = { path = "config/global-constants" }

aptos-move/aptos-debugger/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ edition = "2021"
1212
[dependencies]
1313
anyhow = { workspace = true }
1414
aptos-crypto = { workspace = true }
15+
aptos-gas-schedule = { workspace = true }
1516
aptos-gas = { workspace = true }
1617
aptos-gas-profiling = { workspace = true }
1718
aptos-logger = { workspace = true }

aptos-move/aptos-debugger/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
use anyhow::{format_err, Result};
55
use aptos_gas::{
66
AbstractValueSizeGasParameters, ChangeSetConfigs, NativeGasParameters, StandardGasAlgebra,
7-
StandardGasMeter, LATEST_GAS_FEATURE_VERSION,
7+
StandardGasMeter,
88
};
99
use aptos_gas_profiling::{GasProfiler, TransactionGasLog};
10+
use aptos_gas_schedule::LATEST_GAS_FEATURE_VERSION;
1011
use aptos_memory_usage_tracker::MemoryTrackedGasMeter;
1112
use aptos_resource_viewer::{AnnotatedAccountStateBlob, AptosValueAnnotator};
1213
use aptos_rest_client::Client;

aptos-move/gas-algebra-ext/Cargo.toml renamed to aptos-move/aptos-gas-algebra/Cargo.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
2-
name = "aptos-gas-algebra-ext"
3-
description = "Gas Algebra Ext"
2+
name = "aptos-gas-algebra"
3+
description = "Aptos Gas Algebra"
44
version = "0.0.1"
55

66
# Workspace inherited keys
@@ -13,4 +13,5 @@ repository = { workspace = true }
1313
rust-version = { workspace = true }
1414

1515
[dependencies]
16+
either = { workspace = true }
1617
move-core-types = { workspace = true }

0 commit comments

Comments
 (0)