diff --git a/Cargo.lock b/Cargo.lock index ddbe544fa1..6fb99cb0c5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3313,6 +3313,7 @@ dependencies = [ "dirs-next", "evm-exec-utils", "hex", + "httpmock", "itertools 0.10.1", "move-abigen", "move-binary-format", diff --git a/devtools/x/Cargo.toml b/devtools/x/Cargo.toml index f4a0ab058f..07b13c98d1 100644 --- a/devtools/x/Cargo.toml +++ b/devtools/x/Cargo.toml @@ -20,7 +20,7 @@ guppy = { version = "0.12.3", features = ["summaries"] } indoc = "1.0.3" toml = "0.5.8" env_logger = "0.8.3" -log = "0.4.14" +log = "0.4.17" chrono = "0.4.19" globset = "0.4.6" regex = "1.5.5" diff --git a/language/move-command-line-common/src/movey_constants.rs b/language/move-command-line-common/src/movey_constants.rs index de98638301..178f3032f8 100644 --- a/language/move-command-line-common/src/movey_constants.rs +++ b/language/move-command-line-common/src/movey_constants.rs @@ -6,3 +6,4 @@ pub const MOVEY_URL: &str = "https://movey-app-staging.herokuapp.com"; #[cfg(not(debug_assertions))] pub const MOVEY_URL: &str = "https://www.movey.net"; pub const MOVEY_CREDENTIAL_PATH: &str = "/movey_credential.toml"; +pub const THREAD_WAIT_INTERVAL: u64 = 20; diff --git a/language/tools/move-package/Cargo.toml b/language/tools/move-package/Cargo.toml index ddc3f42580..e46aecb88e 100644 --- a/language/tools/move-package/Cargo.toml +++ b/language/tools/move-package/Cargo.toml @@ -47,6 +47,7 @@ whoami = { version = "1.2.1" } [dev-dependencies] datatest-stable = "0.1.1" +httpmock = "0.6.6" [[test]] name = "test_runner" diff --git a/language/tools/move-package/src/lib.rs b/language/tools/move-package/src/lib.rs index bba42a818b..c1577187a8 100644 --- a/language/tools/move-package/src/lib.rs +++ b/language/tools/move-package/src/lib.rs @@ -130,6 +130,10 @@ pub struct BuildConfig { /// Only fetch dependency repos to MOVE_HOME #[clap(long = "fetch-deps-only", global = true)] pub fetch_deps_only: bool, + + /// Skip the call to Movey API to increase download count + #[clap(long = "skip-movey", global = true)] + pub skip_movey: bool, } #[derive(Debug, Clone, Eq, PartialEq, PartialOrd)] diff --git a/language/tools/move-package/src/resolution/resolution_graph.rs b/language/tools/move-package/src/resolution/resolution_graph.rs index 19059009aa..362fadc297 100644 --- a/language/tools/move-package/src/resolution/resolution_graph.rs +++ b/language/tools/move-package/src/resolution/resolution_graph.rs @@ -9,14 +9,17 @@ use crate::{ layout::SourcePackageLayout, manifest_parser::{parse_move_manifest_string, parse_source_manifest}, parsed_manifest::{ - Dependencies, Dependency, FileName, NamedAddress, PackageDigest, PackageName, + Dependencies, Dependency, FileName, GitInfo, NamedAddress, PackageDigest, PackageName, SourceManifest, SubstOrRename, }, }, BuildConfig, }; use anyhow::{bail, Context, Result}; -use move_command_line_common::files::{find_move_filenames, FileHash}; +use move_command_line_common::{ + files::{find_move_filenames, FileHash}, + movey_constants, +}; use move_core_types::account_address::AccountAddress; use move_symbol_pool::Symbol; use petgraph::{algo, graphmap::DiGraphMap, Outgoing}; @@ -28,6 +31,7 @@ use std::{ path::{Path, PathBuf}, process::Command, rc::Rc, + thread, }; pub type ResolvedTable = ResolutionTable; @@ -388,6 +392,18 @@ impl ResolvingGraph { dep: Dependency, root_path: PathBuf, ) -> Result<(Renaming, ResolvingTable)> { + let already_downloaded = dep + .git_info + .as_ref() + .map(|gi| gi.download_to.exists()) + .unwrap_or(true); + if !already_downloaded && !self.build_options.skip_movey { + Self::increase_movey_download_count( + movey_constants::MOVEY_URL.to_string(), + dep.git_info.as_ref().unwrap(), + ); + } + Self::download_and_update_if_remote(dep_name_in_pkg, &dep)?; let (dep_package, dep_package_dir) = Self::parse_package_manifest(&dep, &dep_name_in_pkg, root_path) @@ -526,8 +542,19 @@ impl ResolvingGraph { }; for (dep_name, dep) in manifest.dependencies.iter().chain(additional_deps.iter()) { - Self::download_and_update_if_remote(*dep_name, dep)?; + let already_downloaded = dep + .git_info + .as_ref() + .map(|gi| gi.download_to.exists()) + .unwrap_or(true); + if !already_downloaded && !build_options.skip_movey { + Self::increase_movey_download_count( + movey_constants::MOVEY_URL.to_string(), + dep.git_info.as_ref().unwrap(), + ); + } + Self::download_and_update_if_remote(*dep_name, dep)?; let (dep_manifest, _) = Self::parse_package_manifest(dep, dep_name, root_path.to_path_buf()) .with_context(|| format!("While processing dependency '{}'", *dep_name))?; @@ -572,6 +599,20 @@ impl ResolvingGraph { } Ok(()) } + + fn increase_movey_download_count(movey_url: String, git_info: &GitInfo) { + let git_url = git_info.git_url.as_str().to_string(); + let git_rev = git_info.git_rev.as_str().to_string(); + let subdir = git_info.subdir.to_string_lossy().to_string(); + thread::spawn(move || { + let params = [("url", git_url), ("rev", git_rev), ("subdir", subdir)]; + let client = reqwest::blocking::Client::new(); + let _ = client + .post(&format!("{}/api/v1/packages/count", movey_url)) + .form(¶ms) + .send(); + }); + } } impl ResolvingPackage { @@ -813,3 +854,77 @@ impl ResolvedPackage { } } } + +#[cfg(test)] +mod tests { + use crate::{ + resolution::resolution_graph::ResolvingGraph, source_package::parsed_manifest::GitInfo, + }; + use httpmock::{prelude::*, Mock}; + use move_command_line_common::movey_constants::THREAD_WAIT_INTERVAL; + use move_symbol_pool::Symbol; + use std::{path::PathBuf, thread, time}; + + fn mock_movey_count_request_with_response_status_code( + server: &MockServer, + status_code: u16, + ) -> (Mock, GitInfo) { + let git_url = Symbol::from("test git url"); + let git_rev = Symbol::from("test git rev"); + let test_subdir = "test_subdir"; + let subdir = PathBuf::from(test_subdir); + let git_info = GitInfo { + git_url, + git_rev, + subdir, + download_to: Default::default(), + }; + let server_mock = server.mock(|when, then| { + when.method(POST) + .path("/api/v1/packages/count") + .x_www_form_urlencoded_tuple("url", git_info.git_url.as_str()) + .x_www_form_urlencoded_tuple("rev", git_info.git_rev.as_str()) + .x_www_form_urlencoded_tuple("subdir", test_subdir); + then.status(status_code); + }); + + (server_mock, git_info) + } + + fn test_thread_wait(wait_time: Option) { + // make sure the spawn thread has enough time to run + let thread_sleep_time = + time::Duration::from_millis(wait_time.unwrap_or(THREAD_WAIT_INTERVAL)); + thread::sleep(thread_sleep_time); + } + + #[test] + fn increase_movey_download_count_calls_movey_api() { + let server = MockServer::start(); + let (server_mock, git_info) = + mock_movey_count_request_with_response_status_code(&server, 200); + ResolvingGraph::increase_movey_download_count(server.base_url(), &git_info); + test_thread_wait(None); + server_mock.assert_hits(1); + } + + #[test] + fn increase_movey_download_count_not_throw_error_if_movey_returns_4xx() { + let server = MockServer::start(); + let (server_mock, git_info) = + mock_movey_count_request_with_response_status_code(&server, 400); + ResolvingGraph::increase_movey_download_count(server.base_url(), &git_info); + test_thread_wait(None); + server_mock.assert_hits(1); + } + + #[test] + fn increase_movey_download_count_not_throw_error_if_movey_returns_5xx() { + let server = MockServer::start(); + let (server_mock, git_info) = + mock_movey_count_request_with_response_status_code(&server, 500); + ResolvingGraph::increase_movey_download_count(server.base_url(), &git_info); + test_thread_wait(None); + server_mock.assert_hits(1); + } +} diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp index 9974fc0647..fb12c0b008 100644 --- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps/Move.exp @@ -16,5 +16,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp index 3862f486ac..238f97a737 100644 --- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_assigned/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp index f8c5b1d503..e039462ed2 100644 --- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp index af0fe4123f..393c22feae 100644 --- a/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/basic_no_deps_test_mode/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp b/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp index 9d61982e1b..f46db592c9 100644 --- a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/diamond_problem_backflow_resolution/Move.exp @@ -19,5 +19,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp b/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp index 9d61982e1b..f46db592c9 100644 --- a/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/diamond_problem_no_conflict/Move.exp @@ -19,5 +19,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp b/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp index c95634f0ae..5e1250982e 100644 --- a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename/Move.exp @@ -20,5 +20,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp b/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp index 81b4a35692..6947e90afc 100644 --- a/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/multiple_deps_rename_one/Move.exp @@ -20,5 +20,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp b/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp index baed78ba25..383db4b9de 100644 --- a/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/one_dep/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp b/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp index c21c42001e..dabb7392bf 100644 --- a/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/one_dep_assigned_address/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp b/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp index baed78ba25..383db4b9de 100644 --- a/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/one_dep_renamed/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp b/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp index baed78ba25..383db4b9de 100644 --- a/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/one_dep_with_scripts/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp b/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp index 3862f486ac..238f97a737 100644 --- a/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp +++ b/language/tools/move-package/tests/test_sources/compilation/test_symlinks/Move.exp @@ -18,5 +18,6 @@ CompiledPackageInfo { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, } diff --git a/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp b/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp index 65763af335..849233df06 100644 --- a/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp +++ b/language/tools/move-package/tests/test_sources/parsing/invalid_identifier_package_name/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp b/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp index 6906f4935b..0977edae2e 100644 --- a/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp +++ b/language/tools/move-package/tests/test_sources/parsing/minimal_manifest/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp index 88ecefeb75..d0ceb2574c 100644 --- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp index 7cd6b1f870..bcc606c1fa 100644 --- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_assigned/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp index 694993bb91..23d1ab8c70 100644 --- a/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/basic_no_deps_address_not_assigned_with_dev_assignment/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp b/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp index c599d4e6d6..7d2437b6b6 100644 --- a/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/dep_good_digest/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp index cd5711fa69..f9f08ed00f 100644 --- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_backflow_resolution/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp index f74f6a87ce..5c7c100553 100644 --- a/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/diamond_problem_no_conflict/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp b/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp index 9e6a787ade..a24c8bfe9c 100644 --- a/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/multiple_deps_rename/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp index 0a225bf404..7ffd405802 100644 --- a/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/one_dep/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp index f3b6a1384f..633afd308e 100644 --- a/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/one_dep_assigned_address/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp index d073d1d5f3..d892bbd1e5 100644 --- a/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/one_dep_multiple_of_same_name/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp index b0fd165cd8..12b40821ce 100644 --- a/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/one_dep_reassigned_address/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo { diff --git a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp b/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp index de214ddc88..5c68b110d1 100644 --- a/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp +++ b/language/tools/move-package/tests/test_sources/resolution/one_dep_unification_across_local_renamings/Move.exp @@ -12,6 +12,7 @@ ResolutionGraph { additional_named_addresses: {}, architecture: None, fetch_deps_only: false, + skip_movey: false, }, root_package: SourceManifest { package: PackageInfo {