From 0e5c44b529555a33d9609c9c5b253a2b50f73f72 Mon Sep 17 00:00:00 2001 From: tersec Date: Mon, 4 Dec 2023 11:55:56 +0000 Subject: [PATCH] use v5.3.0 slashing interchange test vectors (#5640) --- tests/slashing_protection/test_fixtures.nim | 11 +++++++---- vendor/nim-eth2-scenarios | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/slashing_protection/test_fixtures.nim b/tests/slashing_protection/test_fixtures.nim index 0e4e75c032..98ce22d5c3 100644 --- a/tests/slashing_protection/test_fixtures.nim +++ b/tests/slashing_protection/test_fixtures.nim @@ -8,10 +8,8 @@ {.used.} import - # Standard library - std/os, # Status lib - stew/[results, byteutils], + stew/results, chronicles, # Internal ../../beacon_chain/validators/[slashing_protection, slashing_protection_v2], @@ -20,6 +18,9 @@ import ../testutil, ../testdbutil, ../consensus_spec/fixtures_utils +from std/os import changeFileExt, removeFile, walkDir, `/` +from stew/byteutils import toHex + type TestInterchange = object name: string @@ -55,6 +56,7 @@ type slot: SlotString signing_root: Eth2Digest0x should_succeed: bool + should_succeed_complete: bool CandidateVote = object pubkey: PubKey0x @@ -62,6 +64,7 @@ type target_epoch: EpochString signing_root: Eth2Digest0x should_succeed: bool + should_succeed_complete: bool func toHexLogs(v: CandidateBlock): auto = ( @@ -87,7 +90,7 @@ proc sqlite3db_delete(basepath, dbname: string) = removeFile(basepath / dbname&".sqlite3-wal") removeFile(basepath / dbname&".sqlite3") -const InterchangeTestsDir = FixturesDir / "tests-slashing-v5.2.1" / "tests" / "generated" +const InterchangeTestsDir = FixturesDir / "tests-slashing-v5.3.0" / "tests" / "generated" const TestDir = "" const TestDbPrefix = "test_slashprot_" diff --git a/vendor/nim-eth2-scenarios b/vendor/nim-eth2-scenarios index ab0555be9a..b2ec62f396 160000 --- a/vendor/nim-eth2-scenarios +++ b/vendor/nim-eth2-scenarios @@ -1 +1 @@ -Subproject commit ab0555be9a872b018e8d2ab455997e25f8d0dd5d +Subproject commit b2ec62f3965827abefb7d726985dc4d6995353c0