Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix parsing of SMASHPoolId #2309

Merged
merged 2 commits into from
Nov 11, 2020
Merged

Fix parsing of SMASHPoolId #2309

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee57373
Fix parsing of SMASHPoolId, thanks to Piotr
Nov 10, 2020
b24e2a5
Add SMASH to README compatibility matrix
Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 21 additions & 16 deletions lib/core/src/Cardano/Pool/Metadata.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE NumericUnderscores #-}
Expand Down Expand Up @@ -34,13 +35,16 @@ import Cardano.BM.Data.Severity
( Severity (..) )
import Cardano.BM.Data.Tracer
( HasPrivacyAnnotation (..), HasSeverityAnnotation (..) )
import Cardano.Wallet.Api.Types
( defaultRecordTypeOptions )
import Cardano.Wallet.Primitive.AddressDerivation
( hex )
import Cardano.Wallet.Primitive.Types
( PoolId
, StakePoolMetadata (..)
, StakePoolMetadataHash (..)
, StakePoolMetadataUrl (..)
, decodePoolIdBech32
)
import Control.Exception
( IOException, handle )
Expand All @@ -58,10 +62,9 @@ import Data.Aeson
( FromJSON (..)
, ToJSON (..)
, eitherDecodeStrict
, object
, withObject
, (.:)
, (.=)
, fieldLabelModifier
, genericParseJSON
, genericToJSON
)
import Data.Bifunctor
( first )
Expand All @@ -77,6 +80,8 @@ import Data.Text.Class
( TextDecodingError (..), ToText (..), fromText )
import Fmt
( pretty )
import GHC.Generics
( Generic )
import Network.HTTP.Client
( HttpException (..)
, Manager
Expand Down Expand Up @@ -112,22 +117,22 @@ metadaFetchEp pid (StakePoolMetadataHash bytes)
pidStr = T.unpack $ toText pid

-- | TODO: import SMASH types
newtype SMASHPoolId = SMASHPoolId T.Text
deriving stock (Eq, Show, Ord)

instance ToJSON SMASHPoolId where
toJSON (SMASHPoolId poolId) =
object
[ "poolId" .= poolId
]
newtype SMASHPoolId = SMASHPoolId
{ poolId :: T.Text
} deriving stock (Eq, Show, Ord)
deriving (Generic)

instance FromJSON SMASHPoolId where
parseJSON = withObject "SMASHPoolId" $ \o -> do
poolId <- o .: "poolId"
return $ SMASHPoolId poolId
parseJSON = genericParseJSON defaultRecordTypeOptions
{ fieldLabelModifier = id }

instance ToJSON SMASHPoolId where
toJSON = genericToJSON defaultRecordTypeOptions
{ fieldLabelModifier = id }

toPoolId :: SMASHPoolId -> Either TextDecodingError PoolId
toPoolId (SMASHPoolId pid) = fromText pid
toPoolId (SMASHPoolId pid) =
either (\_ -> decodePoolIdBech32 pid) Right (fromText @PoolId pid)

-- | Some default settings, overriding some of the library's default with
-- stricter values.
Expand Down
3 changes: 3 additions & 0 deletions lib/core/src/Cardano/Wallet/Api/Types.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,9 @@ module Cardano.Wallet.Api.Types
, PostTransactionDataT
, PostTransactionFeeDataT
, ApiWalletMigrationPostDataT

-- * other
, defaultRecordTypeOptions
) where

import Prelude
Expand Down