A peer-to-peer stack for code collaboration
Old FromToJSON for machine entries. (#537)
James Haydon9ad916df0761
diff --git a/src/Radicle/Daemon/Ipfs.hs b/src/Radicle/Daemon/Ipfs.hsindex 4af866d..7dc9440 100644--- a/src/Radicle/Daemon/Ipfs.hs+++ b/src/Radicle/Daemon/Ipfs.hs@@ -27,7 +27,6 @@ import qualified Data.Aeson as Aesonimport qualified Data.Aeson.Types as Aesonimport Data.IPLD.CIDimport qualified Data.Map.Strict as Map-import qualified Data.Text as Timport qualified Data.Unique as Uniqueimport System.Timeout@@ -123,10 +122,10 @@ data MachineEntry = MachineEntryinstance Aeson.FromJSON MachineEntry whereparseJSON = Aeson.withObject "MachineEntry" $ \o -> do- expressionCode <- o .: "expression"+ expressionCodes <- o .: "expressions"let src = "[ipfs]"- entryExpressions <-- case parseValues src expressionCode of+ entryExpressions :: [Value] <-+ case traverse (parse src) expressionCodes ofLeft err -> fail $ "failed to parse Radicle expression: " <> show errRight v -> pure ventryPrevious <- Ipfs.parseIpldLink =<< o .: "previous"@@ -134,9 +133,9 @@ instance Aeson.FromJSON MachineEntry whereinstance Aeson.ToJSON MachineEntry wheretoJSON MachineEntry{..} =- let code = T.intercalate "\n" $ map renderCompactPretty entryExpressions+ let code = map renderCompactPretty entryExpressionsin Aeson.object- [ "expression" .= code+ [ "expressions" .= code, "previous" .= Ipfs.ipldLink entryPrevious]