Switch to using json structure for metering report [DPP-1134] #14891
Conversation
simonmaxen-da
requested review from
nickchapman-da,
remyhaemmerle-da and
ray-roestenburg-da
as code owners
simonmaxen-da
force-pushed
the
help-json-metering
branch
from
07292cb to
add64c6
Compare
| kindToAesonValue (S.ValueKindStructValue (S.Struct sMap)) = | ||
| A.Object aMap | ||
| where | ||
| aMap = KeyMap.fromMap $ fmap s2a $ Map.mapKeys Key.fromText $ Map.mapKeys TL.toStrict sMap |
There was a problem hiding this comment.
| aMap = KeyMap.fromMap $ fmap s2a $ Map.mapKeys Key.fromText $ Map.mapKeys TL.toStrict sMap | |
| aMap = KeyMap.fromMap $ s2a <$> Map.mapKeys (Key.fromText . TL.toStrict) sMap |
| kindToAesonValue (S.ValueKindNumberValue num) = A.Number $ Scientific.fromFloatDigits num | ||
| kindToAesonValue (S.ValueKindBoolValue b) = A.Bool b | ||
|
|
||
| toRawAesonValue :: S.Value -> A.Value |
There was a problem hiding this comment.
I believe that it would be better to use the toJSON function provided by the instance ToJSON defined and autogenerated in Google.Protobuf.Struct.hs.
| s2a (Just v) = toRawAesonValue v | ||
| s2a Nothing = A.Null | ||
|
|
||
| a2s :: A.Value -> Maybe S.Value |
There was a problem hiding this comment.
Here the fromJSON could be used since the instance FromJSON is defined and autogenerated in Google.Protobuf.Struct.hs.
There was a problem hiding this comment.
From discussion w/ @simonmaxen-da, it was stated that these auto generated instances add noisy metadata. So this way of providing Aeson.Values was not followed.
| A.Object aMap | ||
| where | ||
| aMap = KeyMap.fromMap $ fmap s2a $ Map.mapKeys Key.fromText $ Map.mapKeys TL.toStrict sMap | ||
|
|
| a2s :: A.Value -> Maybe S.Value | ||
| a2s v = Just $ toRawStructValue v | ||
|
|
||
| kindToAesonValue :: S.ValueKind -> A.Value |
There was a problem hiding this comment.
This function is specific to toRawAesonValue and maybe it is better to move it there under a where clause
There was a problem hiding this comment.
same for a2s and s2a
| raiseParticipantMeteringReport request report | ||
| raiseGetMeteringReportResponse :: LL.GetMeteringReportResponse -> Perhaps A.Value | ||
| raiseGetMeteringReportResponse (LL.GetMeteringReportResponse _ _ _ (Just reportStruct)) = | ||
| Right $ toRawAesonValue $ S.Value $ Just $ S.ValueKindStructValue reportStruct | ||
|
|
| import qualified Data.Aeson as A | ||
| import qualified Data.Aeson.KeyMap as KeyMap | ||
| import qualified Data.Aeson.Key as Key |
There was a problem hiding this comment.
| import qualified Data.Aeson as A | |
| import qualified Data.Aeson.KeyMap as KeyMap | |
| import qualified Data.Aeson.Key as Key | |
| import qualified Data.Aeson as A | |
| import qualified Data.Aeson.KeyMap as A | |
| import qualified Data.Aeson.Key as A |
changelog_begin changelog_end
simonmaxen-da
force-pushed
the
help-json-metering
branch
from
add64c6 to
323ac6e
Compare
No description provided.