Fix warnings

Author: kdafriend

src/Commands/WalletSign.hs

@@ -7,11 +7,9 @@ module Commands.WalletSign
 
 ------------------------------------------------------------------------------
 import           Control.Error
-import           Control.Lens
 import           Control.Monad
 import           Control.Monad.Trans
 import           Control.Monad.Except
-import           Data.Aeson.Lens
 import           Data.List
 import qualified Data.Set as S
 import           Data.String.Conv
@@ -33,7 +31,6 @@ import           Text.Printf
 import           Types.Encoding
 import           Types.Env
 import           Utils
-import Pact.JSON.Legacy.Value (LegacyValue(_getLegacyValue))
 ------------------------------------------------------------------------------
 
 walletSignCommand :: Env -> WalletSignArgs -> IO ()

src/Kadena/SigningApi.hs

@@ -10,7 +10,6 @@ import Data.Aeson
 import Data.Proxy
 import Data.Text (Text)
 import GHC.Generics
-import Pact.Core.Command.SigData
 import Pact.Core.Command.Types
 import Pact.Core.Command.Client
 

src/Kadena/SigningTypes.hs

@@ -206,7 +206,7 @@ compactEncoding = defaultOptions
     }
   where
     -- As long as names are not empty or just underscores this head should be fine:
-    shortener = head . reverse . filter (/= "") . L.splitOn "_"
+    shortener = fromMaybe "" . listToMaybe . reverse . filter (/= "") . L.splitOn "_"
 
 ------------------- ORPHANS -------------------
 -- We're defining these orphans here because Pact moved away from `ToJSON` to

src/Keys.hs

@@ -97,9 +97,11 @@ fromKeyIndex = fromIntegral . naturalToInteger . unKeyIndex
 phraseToSeed :: MnemonicPhrase -> Crypto.Seed
 phraseToSeed (MnemonicPhrase lst) =
   let phraseMap = wordsToPhraseMap lst
-      Right phrase = Crypto.mnemonicPhrase @12 $ textTo <$> Map.elems phraseMap
-      Right sentence = Crypto.mnemonicPhraseToMnemonicSentence Crypto.english phrase
+      phrase = catchMnemonicError $ Crypto.mnemonicPhrase @12 $ textTo <$> Map.elems phraseMap
+      sentence = catchMnemonicError $ Crypto.mnemonicPhraseToMnemonicSentence Crypto.english phrase
   in sentenceToSeed sentence
+  where
+    catchMnemonicError = either (error "Invalid Mnemonic") id
 
 phraseToEitherSeed :: MnemonicPhrase -> Either String Crypto.Seed
 phraseToEitherSeed (MnemonicPhrase lst) = do
@@ -224,7 +226,9 @@ verify :: PublicKey -> Signature -> ByteString -> Bool
 verify (PublicKey pub) (Signature sig) msg = Crypto.verify xpub msg sig
   where
     dummyChainCode = BS.replicate 32 minBound
-    Right xpub = Crypto.xpub $ pub <> dummyChainCode
+    xpub = case Crypto.xpub $ pub <> dummyChainCode of
+              Right x -> x
+              Left _ -> error "Invalid Public key"
 
 baToText :: ByteArrayAccess b => b -> Text
 baToText = T.decodeUtf8 . BA.pack . BA.unpack

src/Types/TxInputs.hs

@@ -17,7 +17,6 @@ import qualified Data.Text.Encoding as T
 import qualified Data.Text.IO as T
 import           Kadena.SigningTypes ()
 import qualified Pact.JSON.Encode as J
-import           Pact.JSON.Legacy.Value
 import           Pact.Core.Command.RPC
 import           Pact.Core.Command.Client
 import           Pact.Core.Command.Types