Skip to content

Commit 1c0c82a

Browse files
l-monningerl-monninger
committed
fix: merge.
2 parents 2611ba3 + c2064fe commit 1c0c82a

File tree

51 files changed

+159
-55
lines changed

Some content is hidden

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

51 files changed

+159
-55
lines changed

‎Cargo.lock‎

Lines changed: 37 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: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ members = [
2424
"util/movement/*",
2525
"util/movement-aptos/*",
2626
"util/bcs-ext",
27+
"util/types"
2728

2829
]
2930

@@ -192,11 +193,13 @@ mtma-migrator-test-types = { path = "checks/migrator/util/types" }
192193
mtma-migrator-test-accounts-equal-criterion = { path = "checks/migrator/citeria/accounts-equal" }
193194
## util
194195
bcs-ext = { path = "util/bcs-ext" }
195-
movement-syncing = { path = "util/movement/movement-syncing" }
196-
movement-core = { path = "util/movement/movement-core" }
197-
movement-core-util = { path = "util/movement/movement-util" }
196+
movement-syncing = { path = "util/movement/syncing" }
197+
movement-core = { path = "util/movement/core" }
198+
movement-core-util = { path = "util/movement/core-util" }
198199
movement-aptos = { path = "util/movement-aptos/movement-aptos" }
199-
movement-aptos-core = { path = "util/movement-aptos/movement-aptos-core" }
200+
movement-aptos-core = { path = "util/movement-aptos/core" }
201+
movement-aptos-core-util = { path = "util/movement-aptos/core-util" }
202+
mtma-types = { path = "util/types" }
200203

201204
[workspace.lints.clippy]
202205
debug_assert_with_mut_call = "deny"

‎checks/migrator/checks/sketchpad/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ publish = { workspace = true }
99
rust-version = { workspace = true }
1010

1111
[dependencies]
12+
mtma-types = { workspace = true }
1213
mtma-migrator-types = { workspace = true }
1314
mtma-migrator-test-types = { workspace = true }
1415
anyhow = { workspace = true }

‎checks/migrator/util/types/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ aptos-sdk = { workspace = true }
2020
thiserror = { workspace = true }
2121
tokio = { workspace = true }
2222
bcs = { workspace = true }
23+
mtma-types = { workspace = true }
2324

2425
[lints]
2526
workspace = true

‎checks/migrator/util/types/src/criterion.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
pub use mtma_migrator_types::migrator::movement_aptos_migrator;
2-
pub use mtma_migrator_types::migrator::movement_migrator;
3-
41
pub use mtma_migrator_types::migrator::MovementAptosMigrator;
52
pub use mtma_migrator_types::migrator::MovementMigrator;
63
use std::future::Future;

‎checks/node/citeria/global-storage-includes/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rust-version = { workspace = true }
1010

1111
[dependencies]
1212
mtma-node-test-types = { workspace = true }
13+
mtma-types = { workspace = true }
1314
anyhow = { workspace = true }
1415
tracing = { workspace = true }
1516

‎checks/node/citeria/global-storage-includes/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use mtma_node_test_types::criterion::movement_executor::TStateView as _;
33
use mtma_node_test_types::criterion::{
44
Criterion, CriterionError, Criterionish, MovementAptosNode, MovementNode,
55
};
6-
use mtma_node_test_types::criterion::movement_aptos_executor::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
6+
use mtma_types::movement_aptos::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
77
use tracing::debug;
88
pub struct GlobalStorageIncludes;
99

‎checks/node/citeria/global-storage-injective/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ rust-version = { workspace = true }
1010

1111
[dependencies]
1212
mtma-node-test-types = { workspace = true }
13+
mtma-types = { workspace = true }
1314
anyhow = { workspace = true }
1415
tracing = { workspace = true }
1516

‎checks/node/citeria/global-storage-injective/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use mtma_node_test_types::criterion::movement_executor::TStateView as _;
33
use mtma_node_test_types::criterion::{
44
Criterion, CriterionError, Criterionish, MovementAptosNode, MovementNode,
55
};
6-
use mtma_node_test_types::criterion::movement_aptos_executor::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
6+
use mtma_types::movement_aptos::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
77
use tracing::debug;
88
pub struct GlobalStorageInjective;
99

‎checks/node/util/types/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ aptos-storage-interface = { workspace = true }
2121
either = { workspace = true }
2222
mtma-node-types = { workspace = true }
2323
chrono = { workspace = true }
24+
mtma-types = { workspace = true }
2425

2526
[lints]
2627
workspace = true

0 commit comments

Comments
 (0)