Skip to content

Commit

Permalink
fix: patch Arbitrary PoolMetadata to always have 32 bytes for pmHash
Browse files Browse the repository at this point in the history
  • Loading branch information
michalrus committed Feb 4, 2025
1 parent a6193b7 commit ae66876
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 0 deletions.
21 changes: 21 additions & 0 deletions nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs b/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs
index a0e9c8359..9943c7b66 100644
--- a/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs
+++ b/testlib/Test/Cardano/Ledger/Core/Arbitrary.hs
@@ -142,6 +142,7 @@ import Cardano.Ledger.UTxO (UTxO (..))
import Control.Monad (replicateM)
import Control.Monad.Identity (Identity)
import Control.Monad.Trans.Fail.String (errorFail)
+import qualified Data.ByteString
import Data.GenValidity
import Data.Int (Int64)
import Data.Map.Strict (Map)
@@ -497,7 +498,7 @@ instance Crypto c => Arbitrary (PoolParams c) where
<*> arbitrary

instance Arbitrary PoolMetadata where
- arbitrary = PoolMetadata <$> arbitrary <*> arbitrary
+ arbitrary = PoolMetadata <$> arbitrary <*> (Data.ByteString.pack <$> vectorOf 32 arbitrary)

instance Arbitrary StakePoolRelay where
arbitrary = genericArbitraryU
16 changes: 16 additions & 0 deletions nix/cardano-node--apply-patches.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/nix/haskell.nix b/nix/haskell.nix
index ec137f412..cdeb9877b 100644
--- a/nix/haskell.nix
+++ b/nix/haskell.nix
@@ -110,6 +110,11 @@ let
#
modules =
[
+ ({ lib, pkgs, ... }: {
+ packages.cardano-ledger-core.patches = [
+ ./cardano-ledger-core--Arbitrary-PoolMetadata.diff
+ ];
+ })
({ lib, pkgs, ... }: {
packages.cardano-tracer.package.buildable = with pkgs.stdenv.hostPlatform; lib.mkForce (!isMusl);
packages.cardano-node-chairman.components.tests.chairman-tests.buildable = lib.mkForce pkgs.stdenv.hostPlatform.isUnix;
3 changes: 3 additions & 0 deletions nix/internal.nix
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ in rec {
cp -r ${../testgen-hs} ./testgen-hs
sed -r '/^packages:/ a\ testgen-hs' -i cabal.project
sed -r 's/other-modules:\s*/ , /g' -i cardano-submit-api/cardano-submit-api.cabal
patch -p1 -i ${./cardano-node--apply-patches.diff}
cp ${./cardano-ledger-core--Arbitrary-PoolMetadata.diff} nix/cardano-ledger-core--Arbitrary-PoolMetadata.diff
'');
inherit (unpatched) rev shortRev lastModified lastModifiedDate;
};
Expand Down

0 comments on commit ae66876

Please sign in to comment.