PR comments

Author: AlgoStephenAkiki

daemon/algod/api/server/v2/handlers.go

@@ -143,7 +143,13 @@ func (v2 *Handlers) DeleteParticipationKeyByID(ctx echo.Context, participationID
 	}
 
 	err = v2.Node.RemoveParticipationKey(decodedParticipationID)
+
 	if err != nil {
+
+		if errors.Is(err, account.ErrParticipationIDNotFound) {
+			return ctx.JSON(http.StatusOK, generated.ErrorResponse{Message: "participation id not found"})
+		}
+
 		return badRequest(ctx, err, err.Error(), v2.Log)
 	}
 

node/node.go

@@ -825,7 +825,7 @@ func (node *AlgorandFullNode) RemoveParticipationKey(partKey account.Participati
 	partRecord := node.accountManager.Registry().Get(partKey)
 
 	if partRecord.IsZero() {
-		return nil
+		return account.ErrParticipationIDNotFound
 	}
 
 	genID := node.GenesisID()

test/scripts/e2e_subs/rest-participation-key.sh

@@ -23,25 +23,39 @@ popd || exit
 
 call_and_verify "Get List of Keys" "/v2/participation" 200 'Address'
 
+# Find out how many keys there are installed so far
+NUM_IDS_1=$(echo "$RES" | python3 -c 'import json,sys;o=json.load(sys.stdin);print(len(o))')
+
 call_post_and_verify "Install a basic participation key" "/v2/participation" 200 ${NAME_OF_TEMP_PARTKEY} 'partId'
 
-call_and_verify "Get List of Keys" "/v2/participation" 200 'Address'
+# Get the returned participation id from the RESULT (aka $RES) variable
+INSTALLED_ID=$(echo "$RES" | python3 -c 'import json,sys;o=json.load(sys.stdin);print(o["partId"])')
+
+# Should contain the installed id
+call_and_verify "Get List of Keys" "/v2/participation" 200 'Address' "${INSTALLED_ID}"
 
-# Let's get a key from the previous response manually and request it specifically
-SAMPLE_ID=$(curl -q -s -H "Authorization: Bearer $ADMIN_TOKEN" "$NET/v2/participation" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj[0]["ID"])')
-NUMBER_OF_IDS=$(curl -q -s -H "Authorization: Bearer $ADMIN_TOKEN" "$NET/v2/participation" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(len(obj))')
+# Get list of keys
+NUM_IDS_2=$(echo "$RES" | python3 -c 'import json,sys;o=json.load(sys.stdin);print(len(o))')
+
+if [[ $((NUM_IDS_1 + 1)) -ne $NUM_IDS_2 ]]; then
+  printf "\n\nFailed test.  New number of IDs (%s) is not one more than old ID count(%s)\n\n" "${NUM_IDS_2}" "${NUM_IDS_1}"
+  exit 1
+fi
 
-call_and_verify "Get a specific ID" "/v2/participation/${SAMPLE_ID}" 200 "${SAMPLE_ID}"
+call_and_verify "Get a specific ID" "/v2/participation/${INSTALLED_ID}" 200 "${INSTALLED_ID}"
 
-call_delete_and_verify "Delete the specific ID" "/v2/participation/${SAMPLE_ID}" 200
+# Should return 200 but not return that error message
+call_delete_and_verify "Delete the specific ID" "/v2/participation/${INSTALLED_ID}" 200 false 'participation id not found'
 
-# Verify that it got called previously and will NOT return an error now even though it isn't there
-call_delete_and_verify "Delete the specific ID" "/v2/participation/${SAMPLE_ID}" 200
+# Verify that it got called previously and will NOT return an error now even though it isn't there.
+# But it will contain a message saying that no key was found
+call_delete_and_verify "Delete the specific ID" "/v2/participation/${INSTALLED_ID}" 200 true 'participation id not found'
 
-NEW_NUMBER_OF_IDS=$(curl -q -s -H "Authorization: Bearer $ADMIN_TOKEN" "$NET/v2/participation" | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(len(obj))')
+# Get list of keys
+NUM_IDS_3=$(echo "$RES" | python3 -c 'import json,sys;o=json.load(sys.stdin);print(len(o))')
 
-if [[ "$NEW_NUMBER_OF_IDS" -ge "$NUMBER_OF_IDS" ]]; then
-  printf "\n\nFailed test.  New number of IDs (%s) is greater than or equal to original IDs (%s)\n\n" "${NEW_NUMBER_OF_IDS}" "${NUMBER_OF_IDS}"
+if [[ "$NUM_IDS_3" -ne "$NUM_IDS_1" ]]; then
+  printf "\n\nFailed test.  New number of IDs (%s) is not equal to original ID count (%s)\n\n" "${NUM_IDS_3}" "${NUM_IDS_1}"
   exit 1
 fi
 

test/scripts/e2e_subs/rest.sh

@@ -129,6 +129,7 @@ function curl_post_test {
 # $1 - test description.
 # $2 - query
 # $3 - expected status code
+# $4 - match result
 function call_delete_and_verify {
   local DESCRIPTION="$1"
   shift
@@ -137,6 +138,9 @@ function call_delete_and_verify {
   local EXPECTED_CODE="$1"
   shift
 
+  local MATCH_RESULT="$1"
+  shift
+
   set +e
 
   local CODE
@@ -146,7 +150,7 @@ function call_delete_and_verify {
     CODE=$(call_delete "$QUERY" "${TEMPDIR}/curl_out.txt" )
   fi
 
-  verify $? "$CODE" "$DESCRIPTION" "$QUERY" "$EXPECTED_CODE" "false"
+  verify $? "$CODE" "$DESCRIPTION" "$QUERY" "$EXPECTED_CODE" "$MATCH_RESULT" "$@"
 
 }
 
@@ -265,12 +269,6 @@ function verify {
     fail_and_exit "$DESCRIPTION" "$QUERY" "unexpected HTTP status code expected $EXPECTED_CODE (actual $CODE): $RES"
   fi
 
-  #local ELAPSED=$(($SECONDS - $START))
-  #if [[ $ELAPSED -gt $MAX_TIME ]]; then
-  #  fail_and_exit "$DESCRIPTION" "$QUERY" "query duration too long, $ELAPSED > $MAX_TIME"
-  #fi
-
-
   local SUBSTRING
 
   # Check result substrings
@@ -286,6 +284,4 @@ function verify {
       fi
     fi
   done
-
-
-}
+}