From 64374a0ef832adb29d0658de874b2cb3ec29045a Mon Sep 17 00:00:00 2001 From: Greg Hale Date: Tue, 21 Nov 2023 15:15:32 -0800 Subject: [PATCH] Fixup poseidon tests --- cabal.project | 4 ++-- test/Chainweb/Test/Pact/PactMultiChainTest.hs | 4 ++-- test/Chainweb/Test/Pact/Utils.hs | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index a55b8f35bf..a3e3aef0db 100644 --- a/cabal.project +++ b/cabal.project @@ -63,8 +63,8 @@ package yet-another-logger source-repository-package type: git location: https://github.com/kadena-io/pact.git - tag: ad875c64cdfe63add23543867b5581d892d23764 - --sha256: sha256-RI1AatVJsSOtFT5t0Q9oMu6BnJg3q92nuTWI4LmrnTw= + tag: 29f34298cb4d2b6eb39fcb5c7f5e592afeb270c1 + --sha256: sha256-0WExmWZQV234IUuDAxvD4LkBl6/R1UMWgSnvhST2GFI= source-repository-package type: git diff --git a/test/Chainweb/Test/Pact/PactMultiChainTest.hs b/test/Chainweb/Test/Pact/PactMultiChainTest.hs index ed3122cdaa..89d9257d66 100644 --- a/test/Chainweb/Test/Pact/PactMultiChainTest.hs +++ b/test/Chainweb/Test/Pact/PactMultiChainTest.hs @@ -1120,7 +1120,7 @@ pact410UpgradeTest = do PactTxTest poseidonTx $ assertTxFailure "Should not resolve new pact native: poseidon-hash-hack-a-chain" "Cannot resolve poseidon-hash-hack-a-chain" - ] + ] runToHeight 120 runBlockTest @@ -1170,7 +1170,7 @@ pact410UpgradeTest = do ] where - poseidonTx = buiildBasic $ mkExec' "(poseidon-hash-hack-a-chain 1)" + poseidonTx = buildBasic $ mkExec' "(poseidon-hash-hack-a-chain 1)" prefixedSigned = buildBasicGasWebAuthnPrefixedSigner 1000 $ mkExec' "1" prefixedSignerBareKey = buildBasicGasWebAuthnPrefixedSigner 1000 $ mkExec diff --git a/test/Chainweb/Test/Pact/Utils.hs b/test/Chainweb/Test/Pact/Utils.hs index febb0ce090..15cba8ff1f 100644 --- a/test/Chainweb/Test/Pact/Utils.hs +++ b/test/Chainweb/Test/Pact/Utils.hs @@ -134,7 +134,6 @@ import Control.Monad.Catch import Control.Monad.IO.Class import Data.Aeson (Value(..), object, (.=), Key) -import Data.Bifunctor import Data.ByteString (ByteString) import qualified Data.ByteString.Short as BS import Data.Decimal @@ -165,7 +164,7 @@ import Test.Tasty -- internal pact modules -import Pact.ApiReq (ApiKeyPair(..), mkKeyPairs, mkKeyPairsWithWebAuthnSigEncoding) +import Pact.ApiReq (ApiKeyPair(..), mkKeyPairs) import Pact.Gas import Pact.JSON.Legacy.Value import Pact.Types.Capability @@ -626,7 +625,6 @@ mkDynKeyPairs (CmdSigner Signer{..} privKey) = where diePubKey str = error $ "pubkey: " <> str diePrivKey str = error $ "privkey: " <> str - dieAddress str = error $ "address: " <> str toApiKp :: MonadThrow m => CmdSigner -> m ApiKeyPair toApiKp (CmdSigner Signer{..} privKey) = do