ipfs 1.3.2 → 1.4.0

raw patch · 14 files changed

+45/−39 lines, 14 filesdep −servant-serverPVP ok

version bump matches the API change (PVP)

Dependencies removed: servant-server

API changes (from Hackage documentation)

+ Network.IPFS.Peer: disconnect :: MonadLocalIPFS m => Peer -> m (Either Error ())

+ Network.IPFS.Peer.Error: CannotDisconnect :: Peer -> Error

Files

ipfs.cabal +1/−3
library/Network/IPFS/CID/Types.hs +4/−4
library/Network/IPFS/Client.hs +1/−1
library/Network/IPFS/Client/Add.hs +3/−3
library/Network/IPFS/Client/Param.hs +1/−1
library/Network/IPFS/Client/Pin.hs +1/−1
library/Network/IPFS/Client/Stat.hs +1/−1
library/Network/IPFS/Internal/Orphanage/ByteString/Lazy.hs +2/−2
library/Network/IPFS/Name/Types.hs +4/−4
library/Network/IPFS/Path/Types.hs +3/−3
library/Network/IPFS/Peer.hs +7/−0
library/Network/IPFS/Peer/Error.hs +5/−4
library/Network/IPFS/Peer/Types.hs +5/−5
library/Network/IPFS/SparseTree/Types.hs +7/−7

ipfs.cabal view

@@ -5,7 +5,7 @@ -- see: https://github.com/sol/hpack  name:           ipfs-version:        1.3.2+version:        1.4.0 synopsis:       Access IPFS locally and remotely description:    Interact with the IPFS network by shelling out to a local IPFS node or communicating via the HTTP interface of a remote IPFS node. category:       Network@@ -155,7 +155,6 @@     , servant-multipart     , servant-multipart-api     , servant-multipart-client-    , servant-server     , swagger2     , text     , vector@@ -235,7 +234,6 @@     , servant-multipart     , servant-multipart-api     , servant-multipart-client-    , servant-server     , swagger2     , text     , vector

library/Network/IPFS/CID/Types.hs view

@@ -3,12 +3,12 @@   , mkCID   ) where -import qualified RIO.ByteString.Lazy as Lazy+import qualified RIO.ByteString.Lazy        as Lazy import           RIO.Char-import qualified RIO.Text            as Text+import qualified RIO.Text                   as Text -import Data.Swagger-import Servant+import           Data.Swagger+import           Servant.API  import qualified Network.IPFS.Internal.UTF8 as UTF8 import           Network.IPFS.Prelude

library/Network/IPFS/Client.hs view

@@ -10,7 +10,7 @@  import qualified RIO.ByteString.Lazy                             as Lazy -import           Servant+import           Servant.API import           Servant.Client import           Servant.Multipart.Client                        ()

library/Network/IPFS/Client/Add.hs view

@@ -1,10 +1,10 @@ module Network.IPFS.Client.Add (API) where -import qualified RIO.ByteString.Lazy as Lazy+import qualified RIO.ByteString.Lazy    as Lazy -import Servant+import           Servant.API -import Network.IPFS.CID.Types (CID)+import           Network.IPFS.CID.Types (CID)  type API = ReqBody '[PlainText] Lazy.ByteString         :> Post    '[PlainText] CID

library/Network/IPFS/Client/Param.hs view

@@ -3,7 +3,7 @@   , IsRecursive   ) where -import           Servant+import           Servant.API  import           Network.IPFS.CID.Types

library/Network/IPFS/Client/Pin.hs view

@@ -7,7 +7,7 @@  import qualified RIO.Text                  as Text -import           Servant+import           Servant.API  import           Network.IPFS.Prelude

library/Network/IPFS/Client/Stat.hs view

@@ -1,6 +1,6 @@ module Network.IPFS.Client.Stat (API) where -import           Servant+import           Servant.API  import           Network.IPFS.Prelude

library/Network/IPFS/Internal/Orphanage/ByteString/Lazy.hs view

@@ -2,8 +2,8 @@  module Network.IPFS.Internal.Orphanage.ByteString.Lazy () where -import qualified RIO.ByteString.Lazy as Lazy-import           Servant+import qualified RIO.ByteString.Lazy  as Lazy+import           Servant.API  import           Network.IPFS.Prelude

library/Network/IPFS/Name/Types.hs view

@@ -1,11 +1,11 @@ module Network.IPFS.Name.Types (Name (..)) where -import qualified RIO.Text as Text+import qualified RIO.Text             as Text -import Servant-import Data.Swagger (ToParamSchema, ToSchema (..))+import           Data.Swagger         (ToParamSchema, ToSchema (..))+import           Servant.API -import Network.IPFS.Prelude+import           Network.IPFS.Prelude  newtype Name = Name { unName :: String }   deriving          ( Eq

library/Network/IPFS/Path/Types.hs view

@@ -1,10 +1,10 @@ module Network.IPFS.Path.Types (Path (..)) where -import Data.Swagger (ToSchema (..))-import Servant+import           Data.Swagger               (ToSchema (..))+import           Servant.API -import           Network.IPFS.Prelude import qualified Network.IPFS.Internal.UTF8 as UTF8+import           Network.IPFS.Prelude  -- | CID path --

library/Network/IPFS/Peer.hs view

@@ -3,6 +3,7 @@   , rawList   , connect   , connectRetry+  , disconnect   , getExternalAddress   ) where @@ -37,6 +38,12 @@ connect peer@(Peer peerID) = IPFS.runLocal ["swarm", "connect"] (UTF8.textToLazyBS peerID) >>= pure . \case   Left _  -> Left $ CannotConnect peer   Right _ -> Right ()++disconnect :: MonadLocalIPFS m => Peer -> m (Either IPFS.Peer.Error ())+disconnect peer@(Peer peerID) =+  IPFS.runLocal ["swarm", "disconnect"] (UTF8.textToLazyBS peerID) >>= pure . \case+    Left _  -> Left $ CannotDisconnect peer+    Right _ -> Right ()  connectRetry :: MonadLocalIPFS m => Peer -> Natural -> m (Either IPFS.Peer.Error ()) connectRetry peer 0 = return . Left $ CannotConnect peer

library/Network/IPFS/Peer/Error.hs view

@@ -1,11 +1,12 @@ module Network.IPFS.Peer.Error (Error (..)) where -import Network.IPFS.Prelude-import Network.IPFS.Peer.Types+import           Network.IPFS.Peer.Types+import           Network.IPFS.Prelude  data Error-  = DecodeFailure String-  | CannotConnect Peer+  = DecodeFailure    String+  | CannotConnect    Peer+  | CannotDisconnect Peer   | UnknownErr Text   deriving ( Exception            , Eq

library/Network/IPFS/Peer/Types.hs view

@@ -1,11 +1,11 @@ module Network.IPFS.Peer.Types (Peer (..)) where -import RIO+import           RIO -import Control.Lens-import Data.Aeson-import Data.Swagger-import Servant+import           Control.Lens+import           Data.Aeson+import           Data.Swagger+import           Servant.API  import qualified Network.IPFS.Internal.UTF8 as UTF8

library/Network/IPFS/SparseTree/Types.hs view

@@ -3,17 +3,17 @@   , Tag (..)   ) where -import qualified RIO.HashMap as HashMap-import qualified RIO.Map     as Map-import qualified RIO.Text    as Text+import qualified RIO.HashMap                as HashMap+import qualified RIO.Map                    as Map+import qualified RIO.Text                   as Text -import Data.Swagger hiding (Tag, name)-import Servant+import           Data.Swagger               hiding (Tag, name)+import           Servant.API -import           Network.IPFS.Prelude-import qualified Network.IPFS.Internal.UTF8 as UTF8 import           Network.IPFS.CID.Types+import qualified Network.IPFS.Internal.UTF8 as UTF8 import           Network.IPFS.Name.Types+import           Network.IPFS.Prelude  -- | Directory structure for CIDs and other identifiers --