Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bad merge #2082

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Fix bad merge #2082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cabal.project.freeze
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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
9 changes: 5 additions & 4 deletions test/unit/Chainweb/Test/Pact5/RemotePactTest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading