From 465b60bc16f6ff513d02aad4f344d08a5634991d Mon Sep 17 00:00:00 2001
From: Charles Lanahan <charles.lanahan@gmail.com>
Date: Sat, 21 Sep 2024 23:31:48 +0200
Subject: [PATCH] Removed --prefix from verify command.

Prefixes are 1-1 with aliases which are already required for this
command and thus redundant.  Removed for ease of use.
---
 scripts/demo/basic/demo-script.sh   | 8 ++++----
 src/keri/app/cli/commands/verify.py | 4 +---
 tests/app/cli/test_kli_commands.py  | 2 --
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/scripts/demo/basic/demo-script.sh b/scripts/demo/basic/demo-script.sh
index 1cdbd6193..dbb851a23 100755
--- a/scripts/demo/basic/demo-script.sh
+++ b/scripts/demo/basic/demo-script.sh
@@ -46,16 +46,16 @@ isSuccess
 kli sign --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature AABuQervAG8QLyvho99362U8TScec_4zYDVF1pUMWfWfKbl5thR6QakpvSvVMdcPcGYxi0McgNtW-Z3EhpC01I4A
+kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature AABuQervAG8QLyvho99362U8TScec_4zYDVF1pUMWfWfKbl5thR6QakpvSvVMdcPcGYxi0McgNtW-Z3EhpC01I4A
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ABBJcS2ZbcHEdEEnaJE1CFUxdsKqkoU5TS34CImGh3s0cs-k3cNcy2PJxQ8WjIvAot1-cZ71o1E-WkqZ-tCTNZsJ
+kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ABBJcS2ZbcHEdEEnaJE1CFUxdsKqkoU5TS34CImGh3s0cs-k3cNcy2PJxQ8WjIvAot1-cZ71o1E-WkqZ-tCTNZsJ
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACBieMVQBXvIxeqQuHc4Db_-GUoFE9e37TW8t6DomwXdMcSxBiHJpDp3EJH1Dcz9lHKbFuCRqoNo4wywZGtUpOcB
+kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACBieMVQBXvIxeqQuHc4Db_-GUoFE9e37TW8t6DomwXdMcSxBiHJpDp3EJH1Dcz9lHKbFuCRqoNo4wywZGtUpOcB
 isSuccess
 
-kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --prefix EIryzWYlZ9bQr7EhMAoBXk4r2h-OgaEqERid7-AHNp6o --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACSHdal6kHAAjbW_frH83sDDCoBHw_nNKFysW5Dj8PSsnwVPePCNw-kFmF6Z8H87q7D3abw_5u2i4jmzdnWFsRDz
+kli verify --name test --base "${KERI_TEMP_DIR}"  --alias trans --text @${KERI_DEMO_SCRIPT_DIR}/data/anchor.json --signature ACSHdal6kHAAjbW_frH83sDDCoBHw_nNKFysW5Dj8PSsnwVPePCNw-kFmF6Z8H87q7D3abw_5u2i4jmzdnWFsRDz
 ret=$?
 if [ $ret -eq 0 ]; then
    echo "Testing invalid signature should fail $ret"
diff --git a/src/keri/app/cli/commands/verify.py b/src/keri/app/cli/commands/verify.py
index 17033bb20..79cb13d55 100644
--- a/src/keri/app/cli/commands/verify.py
+++ b/src/keri/app/cli/commands/verify.py
@@ -19,8 +19,6 @@
 parser.add_argument('--alias', '-a', help='human readable alias for the new identifier prefix', required=True)
 parser.add_argument('--passcode', '-p', help='21 character encryption passcode for keystore (is not saved)',
                     dest="bran", default=None)  # passcode => bran
-
-parser.add_argument("--prefix", help="Identifier prefix of the signer", required=True)
 parser.add_argument('--text', '-t', help='Original signed text or file (starts with "@")', required=True)
 parser.add_argument('--signature', '-s', default=[], help='list of signatures to verify (can appear multiple times)',
                     action="append", required=True)
@@ -54,7 +52,7 @@ def verify(tymth, tock=0.0, **opts):
     try:
         with existing.existingHab(name=name, alias=alias, base=base, bran=bran) as (_, hab):
 
-            kever = hab.kevers[args.prefix]
+            kever = hab.kevers[hab.pre]
 
             txt = args.text
             if txt.startswith("@"):
diff --git a/tests/app/cli/test_kli_commands.py b/tests/app/cli/test_kli_commands.py
index 94d960424..ad175624c 100644
--- a/tests/app/cli/test_kli_commands.py
+++ b/tests/app/cli/test_kli_commands.py
@@ -205,8 +205,6 @@ def test_standalone_kli_commands(helpers, capsys):
                            'ACCLl9pVv7OM4Y261GZkpPWQu__1mw8ffzcFY1lJ62CGjiEh3mvESu_N7a01YOCKqicqEe5TOXSf0j_8qBxPKxwO\n')
 
     args = parser.parse_args(["verify", "--name", "test", "--alias", "trans",
-                              "--prefix",
-                              'EF0bnfg4smFm9Q_OKlKUYRRQctGhTBWUU3rXf7zuA9GU',
                               "--text",
                               "this is test data to sign",
                               "--signature",