Skip to content
This repository was archived by the owner on May 4, 2024. It is now read-only.

[move-package] Support dependency overrides #1023

Open
wants to merge 10 commits into
base: sui-move
Choose a base branch
from
Open

[move-package] Support dependency overrides #1023

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0eeded6
Added dep override parsing and local path normalization
awelc Mar 28, 2023
6312772
[move-package] Support dependency overrides
awelc Mar 30, 2023
9b461a3
Fixed a linting problem
awelc Mar 30, 2023
b9870ed
Addressing review comments - round one
awelc Apr 17, 2023
aafc655
Addressing review comments - round two
awelc Apr 20, 2023
2ddd632
Refactoring and documentation updates
awelc Apr 20, 2023
2672c71
Finessed some comments
awelc Apr 21, 2023
97267a8
Added more tests and updated comments
awelc Apr 21, 2023
371296b
Removed accidentally added temp files
awelc Apr 21, 2023
fa8a38f
Fixed linting errors
awelc Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
300 changes: 172 additions & 128 deletions language/tools/move-package/src/resolution/dependency_graph.rs
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions ...ls/move-package/tests/test_sources/diamond_problem_dep_external_no_conflict/Move.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ ResolvedGraph {
),
],
"A": [
(
"Root",
Incoming,
),
(
"ADep",
Outgoing,
),
(
"Root",
Incoming,
),
],
},
package_table: {
Expand Down
8 changes: 4 additions & 4 deletions ...tools/move-package/tests/test_sources/diamond_problem_dep_external_override/Move.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ ResolvedGraph {
),
],
"A": [
(
"Root",
Incoming,
),
(
"ADep",
Outgoing,
),
(
"Root",
Incoming,
),
],
},
package_table: {
Expand Down
1 change: 1 addition & 0 deletions ...ove-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Failed to resolve dependencies for package 'Root': Found cycle between packages: D -> B -> C -> D
27 changes: 27 additions & 0 deletions ...ls/move-package/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Dependency graph and and override (ov) - when override is processed there is no entry in the graph
# yet (override is incorrect). This part is the same as in the
# diamond_problem_dep_incorrect_override_empty test. Additionally, a cycle introduced during graph
# construction interferes with part of the algorithm responsible for validating potentially
# incorrect overrides (dependency_graph::override_verify) and if not explicitly handled would
# trigger infinite recursion.
#
# +--------------------------------------------+
# | |
# +---->+----+ |
# +---->| B |----+ |
# | +----+ | |
# | | |
# +----+ | | +----+ +----+--+ v1 +----+
# |Root|----+ +---->| C |-------->| D |--------->| E |
# +----+ | | +----+ +----+ +--->+----+
# | | |
# | +----+----+ ov(2) |
# +---->| A |------------------------------------+
# +----+
[package]
name = "Root"
version = "0.0.0"

[dependencies]
A = { local = "./deps_only/A" }
B = { local = "./deps_only/B" }
7 changes: 7 additions & 0 deletions ...age/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/A/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "A"
version = "0.0.0"

[dependencies]
C = { local = "../C" }
E = { local = "../E", version = "2.0.0", override = true }
6 changes: 6 additions & 0 deletions ...age/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/B/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "B"
version = "0.0.0"

[dependencies]
C = { local = "../C" }
6 changes: 6 additions & 0 deletions ...age/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/C/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[package]
name = "C"
version = "0.0.0"

[dependencies]
D = { local = "../D", version = "1.0.0" }
7 changes: 7 additions & 0 deletions ...age/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/D/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "D"
version = "0.0.0"

[dependencies]
B = { local = "../B" }
E = { local = "../E", version = "1.0.0" }
3 changes: 3 additions & 0 deletions ...age/tests/test_sources/diamond_problem_dep_incorrect_override_cycle/deps_only/E/Move.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[package]
name = "E"
version = "0.0.0"
8 changes: 4 additions & 4 deletions language/tools/move-package/tests/test_sources/external_overlap/Move.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ ResolvedGraph {
),
],
"A": [
(
"Root",
Incoming,
),
(
"ADep",
Outgoing,
),
(
"Root",
Incoming,
),
],
},
package_table: {
Expand Down