mirror of
https://github.com/unclechu/gRPC-haskell.git
synced 2024-11-13 06:39:41 +01:00
Remove proto3-wire
dependency from core
package. (#47)
This commit is contained in:
parent
9cfb3da770
commit
5fd44880da
4 changed files with 5 additions and 9 deletions
|
@ -28,7 +28,7 @@ used to give you a development environment where you can use the `cabal` and
|
|||
`stack` toolchains for development and testing:
|
||||
|
||||
```bash
|
||||
$ nix-shell release-nix -A grpc-haskell.env
|
||||
$ nix-shell release.nix -A grpc-haskell.env
|
||||
[nix-shell]$ cabal configure --enable-tests && cabal build && cabal test
|
||||
```
|
||||
|
||||
|
|
|
@ -26,9 +26,6 @@ library
|
|||
, managed >= 1.0.0 && < 1.1
|
||||
, pipes >=4.1 && <=4.4
|
||||
, transformers
|
||||
, proto3-suite
|
||||
, proto3-wire
|
||||
|
||||
, async ==2.1.*
|
||||
, tasty >= 0.11 && <0.12
|
||||
, tasty-hunit >= 0.9 && <0.10
|
||||
|
|
|
@ -21,7 +21,6 @@ import Data.Typeable
|
|||
import qualified Network.GRPC.Unsafe as C
|
||||
import qualified Network.GRPC.Unsafe.Op as C
|
||||
import qualified Network.GRPC.Unsafe.Metadata as C
|
||||
import Proto3.Wire.Decode (ParseError)
|
||||
|
||||
-- | Functions as a proof that the gRPC core has been started. The gRPC core
|
||||
-- must be initialized to create any gRPC state, so this is a requirement for
|
||||
|
@ -50,7 +49,7 @@ data GRPCIOError = GRPCIOCallError C.CallError
|
|||
| GRPCIOUnknownError
|
||||
| GRPCIOBadStatusCode C.StatusCode C.StatusDetails
|
||||
|
||||
| GRPCIODecodeError ParseError
|
||||
| GRPCIODecodeError String
|
||||
| GRPCIOInternalUnexpectedRecv String -- debugging description
|
||||
| GRPCIOHandlerException String
|
||||
deriving (Eq, Show, Typeable)
|
||||
|
|
|
@ -53,7 +53,7 @@ convertServerHandler :: (Message a, Message b)
|
|||
=> ServerHandler a b
|
||||
-> ServerHandlerLL
|
||||
convertServerHandler f c = case fromByteString (payload c) of
|
||||
Left x -> CE.throw (GRPCIODecodeError x)
|
||||
Left x -> CE.throw (GRPCIODecodeError $ show x)
|
||||
Right x -> do (y, tm, sc, sd) <- f (fmap (const x) c)
|
||||
return (toBS y, tm, sc, sd)
|
||||
|
||||
|
@ -99,7 +99,7 @@ convertServerWriterHandler f c send =
|
|||
f (convert <$> c) (convertSend send)
|
||||
where
|
||||
convert bs = case fromByteString bs of
|
||||
Left x -> CE.throw (GRPCIODecodeError x)
|
||||
Left x -> CE.throw (GRPCIODecodeError $ show x)
|
||||
Right x -> x
|
||||
|
||||
type ServerRWHandler a b
|
||||
|
@ -129,7 +129,7 @@ convertRecv =
|
|||
case msg of
|
||||
Nothing -> return Nothing
|
||||
Just bs -> case fromByteString bs of
|
||||
Left x -> Left (GRPCIODecodeError x)
|
||||
Left x -> Left (GRPCIODecodeError $ show x)
|
||||
Right x -> return (Just x)
|
||||
|
||||
convertSend :: Message a => StreamSend ByteString -> StreamSend a
|
||||
|
|
Loading…
Reference in a new issue