mirror of
https://github.com/unclechu/gRPC-haskell.git
synced 2024-12-24 02:39:45 +01:00
Update proto3-suite
ref to 8db2ceb8c48a3f8dc2cbdc492d1e8cbaf8b62a15
(#10)
* Update `proto3-suite` gitrev in `stack.yaml` to `8db2ceb8c48a3f8dc2cbdc492d1e8cbaf8b62a15` * Update `proto3-suite` gitrev in `nix/proto3-suite.nix` to `8db2ceb8c48a3f8dc2cbdc492d1e8cbaf8b62a15` * Regenerate `Echo.hs` via new `proto3-suite` + `compile-proto-file` * Remove additional warnings
This commit is contained in:
parent
5caae587e5
commit
4ab231c1d9
5 changed files with 13 additions and 13 deletions
|
@ -2,6 +2,8 @@
|
|||
{-# LANGUAGE DataKinds #-}
|
||||
{-# LANGUAGE GADTs #-}
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
|
||||
{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
|
||||
-- | Generated by Haskell protocol buffer compiler. DO NOT EDIT!
|
||||
module Echo where
|
||||
import qualified Prelude as Hs
|
||||
|
|
|
@ -8,8 +8,8 @@ mkDerivation {
|
|||
version = "0.1.0.0";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/awakenetworks/proto3-suite.git";
|
||||
sha256 = "0wvr54x3v6g9yb30nd5g9gfnn7j8is2hl8drwmmiyz0n45zlz0qh";
|
||||
rev = "827af4bf644d05e88b5d95dfe40febe7b43fab16";
|
||||
sha256 = "1g6w4ddqybgwnj3143bkl7sp9f5ch6d8qpb242fi4m396585bpq9";
|
||||
rev = "8db2ceb8c48a3f8dc2cbdc492d1e8cbaf8b62a15";
|
||||
};
|
||||
libraryHaskellDepends = [
|
||||
base bytestring cereal containers deepseq filepath haskell-src mtl
|
||||
|
|
|
@ -264,10 +264,10 @@ clientReader cl@Client{ clientCQ = cq } rm tm body initMeta f =
|
|||
withClientCall cl rm tm go
|
||||
where
|
||||
go (unsafeCC -> c) = runExceptT $ do
|
||||
runOps' c cq [ OpSendInitialMetadata initMeta
|
||||
, OpSendMessage body
|
||||
, OpSendCloseFromClient
|
||||
]
|
||||
void $ runOps' c cq [ OpSendInitialMetadata initMeta
|
||||
, OpSendMessage body
|
||||
, OpSendCloseFromClient
|
||||
]
|
||||
srvMD <- recvInitialMetadata c cq
|
||||
liftIO $ f srvMD (streamRecvPrim c cq)
|
||||
recvStatusOnClient c cq
|
||||
|
|
|
@ -373,12 +373,10 @@ serverReader' :: Server
|
|||
serverReader' _ sc@ServerCall{ unsafeSC = c, callCQ = ccq } initMeta f =
|
||||
runExceptT $ do
|
||||
(mmsg, trailMeta, st, ds) <- liftIO $ f sc (streamRecvPrim c ccq)
|
||||
runOps' c ccq ( OpSendInitialMetadata initMeta
|
||||
: OpSendStatusFromServer trailMeta st ds
|
||||
: maybe [] ((:[]) . OpSendMessage) mmsg
|
||||
)
|
||||
return ()
|
||||
|
||||
void $ runOps' c ccq ( OpSendInitialMetadata initMeta
|
||||
: OpSendStatusFromServer trailMeta st ds
|
||||
: maybe [] ((:[]) . OpSendMessage) mmsg
|
||||
)
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- serverWriter (server side of server streaming mode)
|
||||
|
|
|
@ -9,7 +9,7 @@ packages:
|
|||
- '.'
|
||||
- location:
|
||||
git: git@github.com:awakenetworks/proto3-suite.git
|
||||
commit: 827af4bf644d05e88b5d95dfe40febe7b43fab16
|
||||
commit: 8db2ceb8c48a3f8dc2cbdc492d1e8cbaf8b62a15
|
||||
extra-dep: true
|
||||
- location:
|
||||
git: git@github.com:awakenetworks/proto3-wire.git
|
||||
|
|
Loading…
Reference in a new issue