Update client paths

.github/workflows/build.yml

@@ -72,7 +72,8 @@ jobs:
       run: |
         cargo test --manifest-path program/Cargo.toml
         cargo test --manifest-path anker/Cargo.toml
-        cargo test --manifest-path cli/Cargo.toml
+        cargo test --manifest-path cli/maintainer/Cargo.toml
+        cargo test --manifest-path cli/common/Cargo.toml
 
     - name: Build on-chain BPF programs
       run: |

buildimage.sh

@@ -42,7 +42,7 @@ done
 
 ## b. cli
 echo -e  "\nCopying cli and hash to build"
-docker cp $CON_ID:$SOLIPATH/cli/solido ./build/solido
-docker cp $CON_ID:$SOLIPATH/cli/solido.hash ./build/solido.hash
+docker cp $CON_ID:$SOLIPATH/cli/maintainer/solido ./build/solido
+docker cp $CON_ID:$SOLIPATH/cli/maintainer/solido.hash ./build/solido.hash
 
 echo "All build artefacts copied to ./build. Associated container will exit shortly."

docker/Dockerfile.maintainer

@@ -23,7 +23,7 @@ RUN cp -rf  /solido-build/target/release/* $SOLIDOPATH
 COPY LICENSE $SOLIDOPATH
 COPY docker/LICENSE $SOLIDOPATH/LICENSE-DEPENDENCIES
 RUN cd $SOLIDOBUILDPATH \
-    && cargo license --manifest-path cli/Cargo.toml --avoid-dev-deps --avoid-build-deps \
+    && cargo license --manifest-path cli/maintainer/Cargo.toml --avoid-dev-deps --avoid-build-deps \
     >> $SOLIDOPATH/LICENSE-DEPENDENCIES
 
 COPY docker/setup.sh $SOLIDOPATH

docker/LICENSE

@@ -1,7 +1,7 @@
 This file lists the dependencies of the "solido" command-line program, and their
 licenses. An up to date list can be generated with
 
-    cargo license --manifest-path cli/Cargo.toml --avoid-dev-deps --avoid-build-deps
+    cargo license --manifest-path cli/maintainer/Cargo.toml --avoid-dev-deps --avoid-build-deps
 
 Solido itself is licensed under the GNU Public License version 3. The situation
 for "ring" is more subtle, see its license file at [1] (this is a permalink).

tests/check_licenses.py

@@ -76,7 +76,7 @@ def main() -> None:
 
     # Get the dependencies of the on-chain program, and of the CLI binary.
     deps_on_chain = get_deps('program/Cargo.toml')
-    deps_cli = get_deps('cli/Cargo.toml')
+    deps_cli = get_deps('cli/maintainer/Cargo.toml')
     deps = deps_on_chain + deps_cli
 
     for dep in deps:

tests/coverage.py

@@ -151,7 +151,9 @@ def generate_report(executables: List[str]) -> None:
     clean_old_profdata()
 
     binaries = [
-        *build_binaries(['test', '--no-run', '--manifest-path', 'cli/Cargo.toml']),
+        *build_binaries(
+            ['test', '--no-run', '--manifest-path', 'cli/maintainer/Cargo.toml']
+        ),
         *build_binaries(['test', '--no-run', '--manifest-path', 'program/Cargo.toml']),
         *build_binaries(['test', '--no-run', '--manifest-path', 'anker/Cargo.toml']),
         *build_binaries(['build']),