[cli] Reshape askSubmit API for better readability

Author: paolino

cli/src/Core/Context.hs

@@ -81,8 +81,8 @@ askValidation tokenId = do
     ctx <- WithContext ask
     return $ ctxMkValidation ctx tokenId
 
-askSubmit :: Monad m => WithContext m (Wallet -> Submission m)
-askSubmit = ctxSubmit <$> WithContext ask
+askSubmit :: Monad m => Wallet -> WithContext m (Submission m)
+askSubmit w = flip ctxSubmit w <$> WithContext ask
 
 withContext
     :: MPFS m

cli/src/Oracle/Config/Cli.hs

@@ -27,7 +27,7 @@ configCmd
     :: MonadIO m => ConfigCmd a -> WithContext m a
 configCmd (SetConfig tokenId wallet config) = do
     mpfs <- askMpfs
-    Submission submit <- ($ wallet) <$> askSubmit
+    Submission submit <- askSubmit wallet
     present <- lift $ factsCmd mpfs tokenId ConfigFact
     jkey <- toJSON ConfigKey
     jvalue <- toJSON config

cli/src/Oracle/Token/Cli.hs

@@ -153,7 +153,7 @@ tokenCmdCore command = do
     case command of
         -- validateRequest oracle mconfig validation
         UpdateToken tk wallet wanted -> do
-            Submission submit <- ($ wallet) <$> askSubmit
+            Submission submit <- askSubmit wallet
             validation <- askValidation $ Just tk
             mconfig <- askConfig tk
             lift $ runValidate $ do
@@ -181,15 +181,15 @@ tokenCmdCore command = do
                     $ \address -> mpfsUpdateToken mpfs address tk wanted
                 pure txHash
         BootToken wallet -> do
-            Submission submit <- ($ wallet) <$> askSubmit
+            Submission submit <- askSubmit wallet
             lift $ do
                 WithTxHash txHash jTokenId <- submit $ mpfsBootToken mpfs
                 runValidate $ do
                     tkId <- liftMaybe NoTokenIdReturned jTokenId
                     tokenId <- liftMaybe TokenIdNotValidJSON $ fromJSON tkId
                     pure $ WithTxHash txHash (Just tokenId)
         EndToken tk wallet -> do
-            Submission submit <- ($ wallet) <$> askSubmit
+            Submission submit <- askSubmit wallet
             lift $ do
                 WithTxHash txHash _ <- submit
                     $ \address -> mpfsEndToken mpfs address tk

cli/src/User/Agent/Cli.hs

@@ -248,7 +248,7 @@ whiteList tokenId wallet platform repo = do
                 }
         requester = owner wallet
     validation <- askValidation $ Just tokenId
-    Submission submit <- ($ wallet) <$> askSubmit
+    Submission submit <- askSubmit wallet
     mpfs <- askMpfs
     mconfig <- askConfig tokenId
     lift $ runValidate $ do
@@ -277,7 +277,7 @@ blackList tokenId wallet platform repo = do
         change = Change (Key key) (Delete ())
         requester = owner wallet
     validation <- askValidation $ Just tokenId
-    Submission submit <- ($ wallet) <$> askSubmit
+    Submission submit <- askSubmit wallet
     mpfs <- askMpfs
     mconfig <- askConfig tokenId
     lift $ runValidate $ do
@@ -332,7 +332,7 @@ signAndSubmitAnUpdate validate tokenId wallet (Fact testRun oldState) newState =
     let requester = owner wallet
     validation <- lift $ askValidation $ Just tokenId
     mconfig <- lift $ askConfig tokenId
-    Submission submit <- lift $ ($ wallet) <$> askSubmit
+    Submission submit <- lift $ askSubmit wallet
     mpfs <- lift askMpfs
     Config{configAgent} <-
         liftMaybe UpdateTestRunConfigNotAvailable mconfig

cli/src/User/Requester/Cli.hs

@@ -202,7 +202,7 @@ createCommand
     duration = do
         mconfig <- askConfig tokenId
         validation <- askValidation $ Just tokenId
-        Submission submit <- ($ wallet) <$> askSubmit
+        Submission submit <- askSubmit wallet
         mpfs <- askMpfs
         lift $ runValidate $ do
             Config{configTestRun} <-
@@ -233,7 +233,7 @@ registerUser
     wallet
     request = do
         mpfs <- askMpfs
-        Submission submit <- ($ wallet) <$> askSubmit
+        Submission submit <- askSubmit wallet
         validation <- askValidation $ Just tokenId
         lift $ runValidate $ do
             void
@@ -260,7 +260,7 @@ unregisterUser
     request = do
         mpfs <- askMpfs
         validation <- askValidation $ Just tokenId
-        Submission submit <- ($ wallet) <$> askSubmit
+        Submission submit <- askSubmit wallet
         lift $ runValidate $ do
             void
                 $ validateUnregisterUser validation
@@ -286,7 +286,7 @@ registerRole
     request = do
         mpfs <- askMpfs
         validation <- askValidation $ Just tokenId
-        Submission submit <- ($ wallet) <$> askSubmit
+        Submission submit <- askSubmit wallet
         lift $ runValidate $ do
             void
                 $ validateRegisterRole validation
@@ -312,7 +312,7 @@ unregisterRole
     request = do
         mpfs <- askMpfs
         validation <- askValidation $ Just tokenId
-        Submission submit <- ($ wallet) <$> askSubmit
+        Submission submit <- askSubmit wallet
         lift $ runValidate $ do
             void
                 $ validateUnregisterRole validation