[ETCM-202] PR remarks

Author: Michal Mrozek

README.md

@@ -26,20 +26,20 @@ Possible networks: `etc`, `eth`, `mordor`, `testnet-internal`
 
 ### Command Line Interface
 
-`mantis-cli` is a tool that can be used to:
+`cli` is a tool that can be used to:
 
  - generate a new private key
  ```
-./bin/mantis mantis-cli generate-private-key
+./bin/mantis cli generate-private-key
 ```
  - derive an address from private key
 ```
-./bin/mantis mantis-cli derive-address 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0
+./bin/mantis cli derive-address 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0
 ```
  - generate genesis allocs (using private keys or addresses)
 ```
-(private keys) `./bin/mantis mantis-cli generate-alloc --balance=42 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d1`
-(addresses) `./bin/mantis mantis-cli generate-alloc --balance=42 --useAddresses 8b196738d90cf3d9fc299e0ec28e15ebdcbb0bdcb281d9d5084182c9c66d5d12`
+(private keys) `./bin/mantis cli generate-alloc --balance=42 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d0 00b11c32957057651d56cd83085ef3b259319057e0e887bd0fdaee657e6f75d1`
+(addresses) `./bin/mantis cli generate-alloc --balance=42 --useAddresses 8b196738d90cf3d9fc299e0ec28e15ebdcbb0bdcb281d9d5084182c9c66d5d12`
 ```
 
 ### Building the client

src/main/scala/io/iohk/ethereum/cli/CliCommands.scala

@@ -14,8 +14,9 @@ object CliCommands {
   val generatePrivateKeyCommand = "generate-private-key"
   val deriveAddressCommand = "derive-address"
   val generateAllocsCommand = "generate-allocs"
-  val useAddressesFlag = "useAddresses"
   val balanceOption = "balance"
+  val keyOption = "key"
+  val addressOption = "address"
 
   private val GeneratePrivateKeyCommand: Command[String] =
     Command(name = generatePrivateKeyCommand, header = "Generate private key") {
@@ -38,21 +39,17 @@ object CliCommands {
   private val GenerateAllocs: Command[String] =
     Command(name = generateAllocsCommand, header = "Generate genesis allocs") {
 
-      val useAddressesOpt: Opts[Boolean] = Opts
-        .flag(long = useAddressesFlag, help = "Use addresses instead of private keys")
-        .orFalse
+      val keysOpt: Opts[NonEmptyList[String]] =
+        Opts
+          .options[String](long = keyOption, help = "Private key")
+          .map(_.map(key => privKeyToAddress(Hex.decode(key))))
 
-      val keysOpt: Opts[NonEmptyList[String]] = Opts.arguments[String]("key")
+      val addressesOpt: Opts[NonEmptyList[String]] = Opts.options[String](long = addressOption, help = "Address")
 
       val balanceOpt =
         Opts.option[BigInt](long = balanceOption, help = "Initial balance for account", metavar = "balance")
 
-      val addresesOpt = (useAddressesOpt, keysOpt).mapN {
-        case (false, keys) => keys.map(key => privKeyToAddress(Hex.decode(key)))
-        case (true, keys) => keys
-      }
-
-      (addresesOpt, balanceOpt).mapN { (addresses, balance) =>
+      (keysOpt.orElse(addressesOpt), balanceOpt).mapN { (addresses, balance) =>
         allocs(addresses.toList, balance)
       }
     }
@@ -68,7 +65,7 @@ object CliCommands {
     Hex.toHexString(address)
   }
 
-  val api: Command[String] = Command.apply(name = "mantis-cli", header = "Mantis CLI") {
+  val api: Command[String] = Command.apply(name = "cli", header = "Mantis CLI") {
     Opts.subcommands(GeneratePrivateKeyCommand, DeriveAddressFromPrivateKey, GenerateAllocs)
   }
 }

src/test/scala/io/iohk/ethereum/cli/CliCommandsSpec.scala

@@ -26,14 +26,27 @@ class CliCommandsSpec extends AnyFlatSpec with Matchers with EitherValues {
   behavior of generateAllocsCommand
   it should "generate correct alloc using private key" in {
     api
-      .parse(Seq(generateAllocsCommand, privateKey, argument(balanceOption, Some(requestedBalance))))
+      .parse(
+        Seq(
+          generateAllocsCommand,
+          argument(keyOption, Some(privateKey)),
+          argument(balanceOption, Some(requestedBalance))
+        )
+      )
       .right
       .value shouldBe s""""alloc": {$address: { "balance": $requestedBalance }}"""
   }
 
   it should "generate more than one alloc" in {
     api
-      .parse(Seq(generateAllocsCommand, privateKey, privateKey2, argument(balanceOption, Some(requestedBalance))))
+      .parse(
+        Seq(
+          generateAllocsCommand,
+          argument(keyOption, Some(privateKey)),
+          argument(keyOption, Some(privateKey2)),
+          argument(balanceOption, Some(requestedBalance))
+        )
+      )
       .right
       .value shouldBe s""""alloc": {$address: { "balance": $requestedBalance }, $address2: { "balance": $requestedBalance }}"""
   }
@@ -43,10 +56,9 @@ class CliCommandsSpec extends AnyFlatSpec with Matchers with EitherValues {
       .parse(
         Seq(
           generateAllocsCommand,
-          address,
-          address2,
-          argument(balanceOption, Some(requestedBalance)),
-          argument(useAddressesFlag)
+          argument(addressOption, Some(address)),
+          argument(addressOption, Some(address2)),
+          argument(balanceOption, Some(requestedBalance))
         )
       )
       .right