[third party/.../test, compiler] Fix Move.toml files to point to loca…

…l files instead of network to avoid tests using old stdlib. Oddly, this requires fixes to capitalization of std. Fix the resolution warning to make it clear that std needs to be uncapitalized.
aptos-labs · Aug 5, 2023 · 31d69ee · 31d69ee
1 parent 0dac829
commit 31d69ee
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 15 deletions.
diff --git a/aptos-move/aptos-vm-benchmarks/samples/add-numbers/Move.toml b/aptos-move/aptos-vm-benchmarks/samples/add-numbers/Move.toml
@@ -2,6 +2,5 @@
 name = 'add-numbers'
 version = '1.0.0'
 [dependencies.AptosFramework]
-git = 'https://github.com/aptos-labs/aptos-core.git'
-rev = 'main'
+local = '../../../..'
 subdir = 'aptos-move/framework/aptos-framework'
diff --git a/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml b/third_party/move/tools/move-cli/tests/cross_process_tests/Package1/Move.toml
@@ -3,7 +3,7 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
 
 [dependencies]
-MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml b/third_party/move/tools/move-cli/tests/cross_process_tests/Package2/Move.toml
@@ -3,7 +3,7 @@ name = "Package2"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
 
 [dependencies]
-MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
+MoveStdlib = { local = "../../../../move-stdlib" }
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/no_git_remote_package/Move.toml
@@ -3,4 +3,4 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package1/Move.toml
@@ -3,4 +3,4 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package2/Move.toml
@@ -3,4 +3,4 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
diff --git a/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/Move.toml b/third_party/move/tools/move-cli/tests/upload_tests/valid_package3/Move.toml
@@ -3,4 +3,4 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
diff --git a/third_party/move/tools/move-package/src/resolution/resolution_graph.rs b/third_party/move/tools/move-package/src/resolution/resolution_graph.rs
@@ -179,7 +179,7 @@ impl ResolvingGraph {
             bail!(
                 "Unresolved addresses found: [\n{}\n]\n\
                 To fix this, add an entry for each unresolved address to the [addresses] section of {}/Move.toml: \
-                e.g.,\n[addresses]\nStd = \"0x1\"\n\
+                e.g.,\n[addresses]\nstd = \"0x1\"\n\
                 Alternatively, you can also define [dev-addresses] and call with the --dev flag",
                 unresolved_addresses.join("\n"),
                 root_package_path.to_string_lossy()

diff --git a/...party/move/tools/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml b/...party/move/tools/move-package/tests/thread_safety_package_test_sources/Package1/Move.toml
@@ -3,7 +3,7 @@ name = "Package1"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
 
 [dependencies]
-MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
+MoveStdlib = { local = "../../../../../move-stdlib" }
diff --git a/...party/move/tools/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml b/...party/move/tools/move-package/tests/thread_safety_package_test_sources/Package2/Move.toml
@@ -3,7 +3,7 @@ name = "Package2"
 version = "0.0.0"
 
 [addresses]
-Std = "0x1"
+std = "0x1"
 
 [dependencies]
-MoveStdlib = { git = "https://github.com/diem/move.git", subdir = "language/move-stdlib", rev = "98ed299" }
+MoveStdlib = { local = "../../../../../move-stdlib" }