[cli] Remove anti oracle requests validate command

Author: paolino

cli/anti.cabal

@@ -119,9 +119,7 @@ library
     Oracle.Token.Cli
     Oracle.Token.Options
     Oracle.Types
-    Oracle.Validate.Cli
     Oracle.Validate.DownloadAssets
-    Oracle.Validate.Options
     Oracle.Validate.Request
     Oracle.Validate.Requests.Config
     Oracle.Validate.Requests.ManageWhiteList

cli/docs/oracle-role.md

@@ -18,15 +18,10 @@ You can review the token info anytime with
 
 
 ```bash
-anti oracle token get | jq '.result'
+anti token | jq '.result'
 ```
-## Validating requests
+In the requests field you will notice the `validation` field, which will be set to `validated` for all requests that have been validated .
 
-You can use the validate command to automate the process of oracling the requests
-
-```bash
-anti oracle requests validate
-```
 
 ## Updating the anti token
 

cli/docs/requester-role.md

@@ -24,12 +24,12 @@ anti requester register-user --platform github --username alice --pubkeyhash AAA
 
 As with all other requests, once submitted regularly you have to wait for the oracle to merge your request into the Antithesis token.
 
-You can use the `anti oracle token get` command to inspect your pending requests in the Antithesis token.
+You can use the `anti token` command to inspect your pending requests in the Antithesis token.
 
 You can use the `anti facts` command to query the Antithesis token and see if your user is part of the facts.
 
 ```bash
-anti oracle token get | jq '.result.requests' "
+anti token | jq '.result.requests' "
 ```
 
 Until your requests is there, you cannot proceed with the next steps.
@@ -50,6 +50,3 @@ To unregister a user, you can use the `anti requester unregister-user` command.
 ```bash
 anti requester unregister-user --platform github --username alice --pubkeyhash AAAAC3NzaC1lZDI1NTE5AAAAIO773JHqlyLm5XzOjSe+Q5yFJyLFuMLL6+n63t4t7HR8
 ```
-
-
-

cli/src/Oracle/Cli.hs

@@ -6,15 +6,11 @@ module Oracle.Cli
 import Control.Monad.Catch (MonadMask)
 import Control.Monad.IO.Class (MonadIO (..))
 import Core.Context (WithContext)
-import Core.Types.Basic (TokenId)
 import Oracle.Config.Cli (ConfigCmd (..), configCmd)
 import Oracle.Token.Cli (TokenCommand, tokenCmdCore)
-import Oracle.Validate.Cli (ValidateCommand, validateCmd)
 
 data OracleCommand a where
     OracleTokenCommand :: TokenCommand a -> OracleCommand a
-    OracleValidateCommand
-        :: TokenId -> ValidateCommand a -> OracleCommand a
     OracleSetConfigCommand
         :: ConfigCmd a -> OracleCommand a
 
@@ -27,8 +23,4 @@ oracleCmd
     -> WithContext m a
 oracleCmd = \case
     OracleTokenCommand tokenCommand -> tokenCmdCore tokenCommand
-    OracleValidateCommand tokenId validateCommand -> do
-        validateCmd
-            tokenId
-            validateCommand
     OracleSetConfigCommand configCommand -> configCmd configCommand

cli/src/Oracle/Options.hs

@@ -3,7 +3,6 @@ module Oracle.Options
     , oracleCommandParser
     ) where
 
-import Core.Options (tokenIdOption)
 import Lib.Box (Box (..), fmapBox)
 import OptEnvConf
     ( Parser
@@ -13,18 +12,13 @@ import OptEnvConf
 import Oracle.Cli (OracleCommand (..))
 import Oracle.Config.Options (configCommandParser)
 import Oracle.Token.Options (tokenCommandParser)
-import Oracle.Validate.Options (validateCommandParser)
 
 oracleCommandParser
     :: Parser (Box OracleCommand)
 oracleCommandParser =
     commands
         [ command "token" "Manage tokens"
             $ fmapBox OracleTokenCommand <$> tokenCommandParser
-        , command "requests" "Manage requests"
-            $ fmap Box . OracleValidateCommand
-                <$> tokenIdOption
-                <*> validateCommandParser
         , command "config" "Manage configuration"
             $ fmapBox OracleSetConfigCommand <$> configCommandParser
         ]

cli/src/Oracle/Validate/Cli.hs

@@ -104,8 +104,8 @@ being_requester (){
 
 include_requests() {
     being_oracle
-    validation=$(anti oracle requests validate)
-    references=$(echo "$validation" | jq -r '.result | .[] | select(.validation == "validated") | .reference')
+    validation=$(anti token)
+    references=$(echo "$validation" | jq -r '.result.requests | .[] | select(.validation == "validated") | .request.outputRefId')
     if [ -z "$references" ]; then
         log "No references validated: $validation"
         exit 1

cli/src/Oracle/Validate/Options.hs

@@ -39,7 +39,7 @@ being_requester
 outputRef=$(getOutputRef "$result")
 anti retract -o "$outputRef"
 
-result=$(anti oracle token get | jq '.result.requests')
+result=$(anti token | jq '.result.requests')
 if [[ "$result" == "[]" ]]; then
     log "Test passed: User registration successfully retracted"
 else

cli/test-E2E/scenarios/lib.sh

@@ -33,10 +33,8 @@ result=$(anti requester register-user \
 outputRef=$(getOutputRef "$result")
 
 log "Pending requests for the anti oracle token:"
-anti oracle token get | jq '.result.requests | .[]'
+anti token | jq '.result.requests | .[]'
 
-log "Validating the requests pending for the anti oracle token..."
-anti oracle requests validate | jq -r '.result'
 
 log "Updating the anti oracle token with output reference $outputRef..."
 anti oracle token update -o "$outputRef" >/dev/null
@@ -53,10 +51,7 @@ result=$(anti requester register-role \
 outputRef=$(getOutputRef "$result")
 
 log "Pending requests for the anti oracle token:"
-anti oracle token get | jq '.result.requests | .[]'
-
-log "Validating the requests pending for the anti oracle token..."
-anti oracle requests validate | jq -r '.result'
+anti token | jq '.result.requests | .[]'
 
 log "Updating the anti oracle token with output reference $outputRef..."
 anti oracle token update -o "$outputRef" >/dev/null
@@ -75,10 +70,7 @@ result=$(anti requester create-test \
 
 outputRef=$(getOutputRef "$result")
 log "Pending requests for the anti oracle token:"
-anti oracle token get | jq '.result.requests | .[]'
-
-log "Validating the requests pending for the anti oracle token..."
-anti oracle requests validate | jq -r '.result'
+anti token | jq '.result.requests | .[]'
 
 log "Updating the anti oracle token with output reference $outputRef..."
 anti oracle token update -o "$outputRef" >/dev/null