Flatten package commands

Closes: #440

Author: sahithiacn

.github/workflows/ci-test.yml

@@ -334,7 +334,7 @@ jobs:
       - name: Use Node.js 14
         uses: actions/setup-node@v2.4.0
         with:
-          node-version: '14'
+          node-version: "14"
       - name: Install NPM dependencies
         working-directory: language/move-analyzer/editors/code
         run: npm install
@@ -394,4 +394,4 @@ jobs:
       - name: Build BasicCoin Move module
         run: |
           cd ./language/documentation/tutorial/step_1/BasicCoin
-          docker run -v `pwd`:/project move/cli package build
+          docker run -v `pwd`:/project move/cli build

README.md

@@ -24,7 +24,7 @@ docker build -t move/cli -f docker/move-cli/Dockerfile .
 
 ```
 cd ./language/documentation/tutorial/step_1/BasicCoin
-docker run -v `pwd`:/project move/cli package build
+docker run -v `pwd`:/project move/cli build
 ```
 
 ## Community

language/changes/7-packages.md

@@ -267,10 +267,10 @@ NamedAddr = "0xC0FFEE"
 ## Usage, Artifacts, and Data Structures
 
 The Move package system comes with a command line option as part of the Move
-CLI `move package <package_flags> <command> <command_flags>`. Unless a
+CLI `move <flags> <command> <command_flags>`. Unless a
 particular path is provided, all package commands will run in the current working
-directory. The full list of commands and flags for the Move Package CLI can be found by
-running `move package --help`.
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
 
 ### Usage
 

language/documentation/book/src/packages.md

@@ -248,10 +248,10 @@ named_addr = "0xC0FFEE"
 ## Usage, Artifacts, and Data Structures
 
 The Move package system comes with a command line option as part of the Move
-CLI `move package <package_flags> <command> <command_flags>`. Unless a
+CLI `move <flags> <command> <command_flags>`. Unless a
 particular path is provided, all package commands will run in the current working
-directory. The full list of commands and flags for the Move Package CLI can be found by
-running `move package --help`.
+directory. The full list of commands and flags for the Move CLI can be found by
+running `move --help`.
 
 ### Usage
 

language/documentation/book/src/unit-testing.md

@@ -95,7 +95,7 @@ fun test_only_function(...) { ... }
 
 ## Running Unit Tests
 
-Unit tests for a Move package can be run with the [`move package test`
+Unit tests for a Move package can be run with the [`move test`
 command](./packages.md).
 
 When running tests, every test will either `PASS`, `FAIL`, or `TIMEOUT`. If a test case fails, the location of the failure along with the function name that caused the failure will be reported if possible. You can see an example of this below.
@@ -105,7 +105,7 @@ A test will be marked as timing out if it exceeds the maximum number of instruct
 There are also a number of options that can be passed to the unit testing binary to fine-tune testing and to help debug failing tests. These can be found using the the help flag:
 
 ```
-$ move package -h
+$ move -h
 ```
 
 ## Example
@@ -114,7 +114,7 @@ A simple module using some of the unit testing features is shown in the followin
 
 First create an empty package and change directory into it:
 ```
-$ move package new TestExample; cd TestExample
+$ move new TestExample; cd TestExample
 ```
 
 Next add the following to the `Move.toml`:
@@ -173,10 +173,10 @@ module 0x1::my_module {
 
 ### Running Tests
 
-You can then run these tests with the `move package test` command:
+You can then run these tests with the `move test` command:
 
 ```
-$ move package test
+$ move test
 BUILDING MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -192,7 +192,7 @@ Test result: OK. Total tests: 3; passed: 3; failed: 0
 This will only run tests whose fully qualified name contains `<str>`. For example if we wanted to only run tests with `"zero_coin"` in their name:
 
 ```
-$ move package test -f zero_coin
+$ move test -f zero_coin
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -205,7 +205,7 @@ Test result: OK. Total tests: 2; passed: 2; failed: 0
 This bounds the number of instructions that can be executed for any one test to `<bound>`:
 
 ```
-$ move package test -i 0
+$ move test -i 0
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -238,7 +238,7 @@ Test result: FAILED. Total tests: 3; passed: 0; failed: 3
 With these flags you can gather statistics about the tests run and report the runtime and instructions executed for each test. For example, if we wanted to see the statistics for the tests in the example above:
 
 ```
-$ move package test -s
+$ move test -s
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests
@@ -279,7 +279,7 @@ module 0x1::my_module {
 we would get get the following output when running the tests:
 
 ```
-$ move package test -g
+$ move test -g
 CACHED MoveStdlib
 BUILDING TestExample
 Running Move unit tests

language/documentation/examples/diem-framework/build_all.sh

@@ -4,6 +4,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package build &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package build &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package build
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- build &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- build

language/documentation/examples/diem-framework/crates/cli/src/main.rs

@@ -48,13 +48,13 @@ fn main() -> Result<()> {
     let num_natives = natives.len();
 
     let args = DfCli::parse();
-    match &args.cmd {
+    match args.cmd {
         DfCommands::Command(cmd) => move_cli::run_cli(
             natives,
             &cost_table(num_natives),
             // TODO: implement this
             &ErrorMapping::default(),
-            &args.move_args,
+            args.move_args,
             cmd,
         ),
     }

language/documentation/examples/diem-framework/prove_all.sh

@@ -4,6 +4,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package prove &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package prove &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package prove
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- prove &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- prove

language/documentation/examples/diem-framework/test_all.sh

@@ -4,6 +4,6 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- package test &&
-cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- package test &&
-cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- package test
+cd "${SCRIPT_DIR}/move-packages/DPN" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/core" && cargo run -p df-cli -- test &&
+cd "${SCRIPT_DIR}/move-packages/experimental" && cargo run -p df-cli -- test

language/documentation/examples/experimental/math-puzzle/README.md

@@ -30,7 +30,7 @@ In `sources/puzzlie.move`, the function `Puzzle::puzzle` is constructed to take
 
 Use the following command to run Move Prover:
 ```
-move package prove
+move prove
 ```
 
 The following is the expected output of Move Prover:

language/documentation/tutorial/README.md

@@ -55,7 +55,7 @@ cargo install --path language/tools/move-cli
 You can check that it is working by running the following command:
 
 ```bash
-move package --help
+move --help
 ```
 
 You should see something like this along with a list and description of a
@@ -153,18 +153,18 @@ Let's take a look at this function and what it's saying:
 * It creates a `Coin` with the given value and stores it under the
   `account` using the `move_to` operator.
 
-Let's make sure it builds! This can be done with the `package build` command from within the package folder ([`step_1/BasicCoin`](./step_1/BasicCoin/)):
+Let's make sure it builds! This can be done with the `build` command from within the package folder ([`step_1/BasicCoin`](./step_1/BasicCoin/)):
 
 ```bash
-move package build
+move build
 ```
 
 <details>
 <summary>Advanced concepts and references</summary>
 
 * You can create an empty Move package by calling:
     ```bash
-    move package new <pkg_name>
+    move new <pkg_name>
     ```
 * Move code can also live a number of other places.  More information on the
   Move package system can be found in the [Move
@@ -213,7 +213,7 @@ unit tests in Rust if you're familiar with them -- tests are annotated with
 You can run the tests with the `package test` command:
 
 ```bash
-move package test
+move test
 ```
 
 Let's now take a look at the contents of the [`FirstModule.move`
@@ -263,7 +263,7 @@ assertion fails the unit test will fail.
 
 #### Exercises
 * Change the assertion to `11` so that the test fails. Find a flag that you can
-  pass to the `move package test` command that will show you the global state when
+  pass to the `move test` command that will show you the global state when
   the test fails. It should look something like this:
   ```
     ┌── test_mint_10 ──────
@@ -286,7 +286,7 @@ assertion fails the unit test will fail.
     └──────────────────
   ```
 * Find a flag that allows you to gather test coverage information, and
-  then play around with using the `move package coverage` command to look at
+  then play around with using the `move coverage` command to look at
   coverage statistics and source coverage.
 
 </details>
@@ -376,7 +376,7 @@ implementation of the methods inside [`BasicCoin.move`](./step_4/BasicCoin/sourc
 Let's first try building the code using Move package by running the following command
 in [`step_4/BasicCoin`](./step_4/BasicCoin) folder:
 ```bash
-move package build
+move build
 ```
 
 ### Implementation of methods
@@ -466,7 +466,7 @@ take a look at some tools we can use to help us write tests.
 To get started, run the `package test` command in the [`step_5/BasicCoin`](./step_5/BasicCoin) folder
 
 ```bash
-move package test
+move test
 ```
 
 You should see something like this:
@@ -576,7 +576,7 @@ Informally speaking, the block `spec balance_of {...}` contains the property spe
 
 Let's first run the prover using the following command inside [`BasicCoin` directory](./step_7/BasicCoin/):
 ```bash
-move package prove
+move prove
 ```
 
 which outputs the following error information:
@@ -611,7 +611,7 @@ The prover basically tells us that we need to explicitly specify the condition u
 ```
 After adding this condition, try running the `prove` command again to confirm that there are no verification errors:
 ```bash
-move package prove
+move prove
 ```
 Apart from the abort condition, we also want to define the functional properties. In Step 8, we will give more detailed introduction to the prover by specifying properties for the methods defined the `BasicCoin` module.
 

language/documentation/tutorial/step_2_sol/solution_commands

@@ -1,11 +1,11 @@
 # Exercise 1
-move package test -g
+move test -g
 
 # Exercise 2
-move package test --coverage
+move test --coverage
 
 Followed by:
 
-move package coverage summary
-move package coverage summary --summarize-functions
-move package coverage source --module BasicCoin
+move coverage summary
+move coverage summary --summarize-functions
+move coverage source --module BasicCoin

language/evm/examples/README.md

@@ -11,4 +11,4 @@ This directory contains (a growing set of) examples of "Move-on-EVM", a programm
 - [ERC1155.move](./sources/ERC1155.move) contains an implementation of ERC1155 which is the standard for multi-tokens.
 - [TestUniswap.move](./sources/TestUniswap.move) and [TestUniswapLiquidity.move](./sources/TestUniswapLiquidity.move) are the sample client modules of `Uniswap`.
 
-This directory is a Move package. To build the source files, use `move package build`. Moreover, use `move package test` to run the unit tests located in the `tests` directory.
+This directory is a Move package. To build the source files, use `move build`. Moreover, use `move test` to run the unit tests located in the `tests` directory.

language/evm/hardhat-move/src/index.ts

@@ -153,7 +153,7 @@ async function locateMoveExecutablePath(): Promise<Result<string, Error>> {
 
 class MoveBuildError {
     exec_err: ChildProcess.ExecException;
-    // TODO: right now, `move package build` outputs its build errors to stdout instead of stderr.
+    // TODO: right now, `move build` outputs its build errors to stdout instead of stderr.
     // This may not be ideal and we may want to fix it and then revisit the error definition here.
     stdout: string;
     stderr: string;
@@ -166,7 +166,7 @@ class MoveBuildError {
 }
 
 async function movePackageBuild(movePath: string, packagePath: string): Promise<Result<void, MoveBuildError>> {
-    let cmd = `${movePath} package build --path ${packagePath} --arch ethereum`;
+    let cmd = `${movePath} build --path ${packagePath} --arch ethereum`;
 
     let [e, stdout, stderr] = await executeChildProcess(cmd);
 

language/extensions/move-table-extension/tests/move_unit_tests.rs

@@ -1,7 +1,7 @@
 // Copyright (c) The Diem Core Contributors
 // SPDX-License-Identifier: Apache-2.0
 
-use move_cli::package::{cli, cli::UnitTestResult};
+use move_cli::base::test::{run_move_unit_tests, UnitTestResult};
 use move_core_types::account_address::AccountAddress;
 use move_table_extension::table_natives;
 use move_unit_test::UnitTestingConfig;
@@ -15,7 +15,7 @@ fn run_tests_for_pkg(path_to_pkg: impl Into<String>) {
     natives.append(&mut table_natives(
         AccountAddress::from_hex_literal("0x2").unwrap(),
     ));
-    let res = cli::run_move_unit_tests(
+    let res = run_move_unit_tests(
         &pkg_path,
         move_package::BuildConfig {
             test_mode: true,

language/move-prover/doc/user/prover-guide.md

@@ -29,15 +29,15 @@ alias move="cargo run --release --quiet --package move-cli --"
 We assume in the sequel that the Move CLI is reachable from the command line via the `move` command
 (defined by an alias as above or by other means).
 
-In order to call the CLI, you must have a [*move package*](https://diem.github.io/move/packages.html). In the simplest
+In order to call the CLI, you must have a [*move *](https://diem.github.io/move/packages.html). In the simplest
 case, a Move package is defined by a directory with a set of `.move` files in it and a manifest of the name `Move.toml`.
 You can create a package `<name>` in a sub-directory by calling `move package new <name>`.
 
 Now, to call the prover simply use one of the following commands:
 
 ```shell script
-move package -p <path> prove  # Prove the sources of the package at <path>
-move package prove            # Equivalent to `move package -p . prove`
+move -p <path> prove  # Prove the sources of the package at <path>
+move prove            # Equivalent to `move -p . prove`
 ```
 
 ### Target Filtering
@@ -47,27 +47,27 @@ often more effective to focus verification on particular files. You do this with
 `-t` (`--target`) option:
 
 ```shell script
-move package prove -t DiemConfig
+move prove -t DiemConfig
 ```
 
 In general, if the string provided via the `-t` option is contained somewhere in the file name of a source, that source
 will be included for verification.
 
 > NOTE: the Move prover ensures that there is no semantic difference between verifying modules one-by-one
 > or all at once. However, if your goal is to verify all modules, verifying them in a single
-> `move package prove` run will be significantly faster then sequentially.
+> `move prove` run will be significantly faster then sequentially.
 
 ### Prover Options
 
 The prover has a number of options which are not directly handled by the CLI but rather passed through. You pass options
-through with an invocation like `move package prove -- <options>`. The most commonly used option is the `-t` (`--trace`)
+through with an invocation like `move prove -- <options>`. The most commonly used option is the `-t` (`--trace`)
 option which lets the prover produce richer diagnosis when it encounters errors:
 
 ```shell script
-move package prove -t DiemConfig -- -t
+move prove -t DiemConfig -- -t
 ```
 
-To see the list of all command line options, use `move package prove -- --help`.
+To see the list of all command line options, use `move prove -- --help`.
 
 ### Prover Configuration File
 
@@ -113,7 +113,7 @@ proc_cores = 4
 > HINT: for local verification, you may want to set proc_cores to an aggressive number
 > (your actual cores) to speed up the turn-around cycle.
 
-> NOTE: To let the prover dump all the available toml options, use `move package prove -- --print-config`. This
+> NOTE: To let the prover dump all the available toml options, use `move prove -- --print-config`. This
 > will, however, contain many more unrelated and potentially defunct experimental options.
 
 ## Prover Tests