From 99863fe2c01929760d854b83c3592ffd7c282c80 Mon Sep 17 00:00:00 2001 From: Edmund Noble Date: Thu, 19 Dec 2024 16:57:10 -0500 Subject: [PATCH] Fix bad merge --- cabal.project.freeze | 10 +++++----- test/unit/Chainweb/Test/Pact5/RemotePactTest.hs | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/cabal.project.freeze b/cabal.project.freeze index 4d89372f3..95815ffcc 100644 --- a/cabal.project.freeze +++ b/cabal.project.freeze @@ -1,6 +1,6 @@ active-repositories: hackage.haskell.org:merge -constraints: any.Cabal ==3.10.2.0, - any.Cabal-syntax ==3.10.2.0, +constraints: any.Cabal ==3.12.1.0, + any.Cabal-syntax ==3.12.1.0, any.Decimal ==0.5.2, any.Diff ==1.0.2, any.Glob ==0.10.2, @@ -210,7 +210,7 @@ constraints: any.Cabal ==3.10.2.0, hsc2hs -in-ghc-tree, any.http-api-data ==0.6.1, http-api-data -use-text-show, - any.http-client ==0.7.17, + any.http-client ==0.7.18, http-client +network-uri, any.http-client-tls ==0.3.6.4, any.http-date ==0.0.11, @@ -386,7 +386,7 @@ constraints: any.Cabal ==3.10.2.0, any.sop-core ==0.5.0.2, any.sorted-list ==0.2.2.0, any.split ==0.2.5, - any.splitmix ==0.1.0.5, + any.splitmix ==0.1.1, splitmix -optimised-mixer, any.statistics ==0.16.2.1, any.stm ==2.5.2.1, @@ -517,4 +517,4 @@ constraints: any.Cabal ==3.10.2.0, zip-archive -executable, any.zlib ==0.7.1.0, zlib -bundled-c-zlib +non-blocking-ffi +pkg-config -index-state: hackage.haskell.org 2024-12-18T21:45:36Z +index-state: hackage.haskell.org 2024-12-19T19:57:30Z diff --git a/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs b/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs index 2fe4e99a6..2316d624c 100644 --- a/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs +++ b/test/unit/Chainweb/Test/Pact5/RemotePactTest.hs @@ -50,6 +50,7 @@ import Data.String (fromString) import Data.Text (Text) import Data.Text qualified as T import Data.Text.Encoding qualified as T +import GHC.Stack import Network.Connection qualified as HTTP import Network.HTTP.Client.TLS qualified as HTTP import Network.Socket qualified as Network @@ -186,12 +187,12 @@ pollingConfirmationDepthTest baseRdb = runResourceT $ do liftIO $ do cmd1 <- buildTextCmd v (trivialTx cid 42) cmd2 <- buildTextCmd v (trivialTx cid 43) - let rks = Pact5.cmdToRequestKey cmd1 NE.:| [Pact5.cmdToRequestKey cmd2] + let rks = cmdToRequestKey cmd1 NE.:| [cmdToRequestKey cmd2] let expectSuccessful :: (HasCallStack, _) => P.Prop (HashMap RequestKey (CommandResult _ _)) - expectSuccessful = P.propful ? HM.fromList - [ (Pact5.cmdToRequestKey cmd1, P.fun _crResult ? P.equals (PactResultOk (PInteger 42))) - , (Pact5.cmdToRequestKey cmd2, P.fun _crResult ? P.equals (PactResultOk (PInteger 43))) + expectSuccessful = P.propful ? HashMap.fromList + [ (cmdToRequestKey cmd1, P.fun _crResult ? P.equals (PactResultOk (PInteger 42))) + , (cmdToRequestKey cmd2, P.fun _crResult ? P.equals (PactResultOk (PInteger 43))) ] let expectEmpty :: (HasCallStack, _) => _ expectEmpty = P.equals HashMap.empty