Use better state assertions in spec tests (#2932)

packages/spec-test-runner/test/spec/altair/epoch_processing/rewards_and_penalties/rewardsAndPenalties.ts

@@ -8,7 +8,7 @@ import {IAltairStateTestCase} from "../../stateTestCase";
 import {TreeBacked} from "@chainsafe/ssz";
 import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {PresetName} from "@chainsafe/lodestar-params";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 
 export function runRewardsAndPenalties(presetName: PresetName): void {
   // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -43,7 +43,7 @@ export function runRewardsAndPenalties(presetName: PresetName): void {
       },
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/finality/finality.ts

@@ -5,7 +5,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IFinalityTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../util";
+import {expectEqualBeaconStateAltair} from "../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -60,7 +60,7 @@ export function runFinality(presetName: PresetName): void {
       timeout: 10000,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/fork/fork.ts

@@ -8,7 +8,7 @@ import {altair} from "@chainsafe/lodestar-beacon-state-transition";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 import {SPEC_TEST_LOCATION} from "../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../util";
+import {expectEqualBeaconStateAltair} from "../../util";
 import {IUpgradeStateCase} from "./type";
 
 export function runFork(presetName: PresetName): void {
@@ -54,7 +54,7 @@ export function runFork(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/genesis/initialization/initialization.ts

@@ -6,7 +6,7 @@ import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-tes
 import {initializeBeaconStateFromEth1} from "@chainsafe/lodestar-beacon-state-transition";
 
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {PresetName} from "@chainsafe/lodestar-params";
 
 interface IGenesisInitSpecTest {
@@ -59,7 +59,7 @@ export function runInitialization(presetName: PresetName): void {
       timeout: 10000,
       getExpected: (testCase) => testCase.state,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/attestations/attestations.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessAttestationTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -47,7 +47,7 @@ export function runAttestations(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/attesterSlashing/attesterSlashing.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessAttesterSlashingTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -48,7 +48,7 @@ export function runAttesterSlashing(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/blockHeader/blockHeader.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessBlockHeader} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -45,7 +45,7 @@ export function runBlockHeader(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/deposit/deposit.ts

@@ -5,7 +5,7 @@ import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-tes
 import {join} from "path";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {IProcessDepositTestCase} from "./type";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -44,7 +44,7 @@ export function runDeposit(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/proposerSlashing/proposerSlashing.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessProposerSlashingTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -46,7 +46,7 @@ export function runProposerSlashing(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/syncAggregate/syncAggregate.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessSyncCommitteeTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -60,7 +60,7 @@ export function runSyncAggregate(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/operations/voluntaryExit/voluntaryExit.ts

@@ -6,7 +6,7 @@ import {allForks, altair} from "@chainsafe/lodestar-beacon-state-transition";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {IProcessVoluntaryExitTestCase} from "./type";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -46,7 +46,7 @@ export function runVoluntaryExit(presetName: PresetName): void {
       shouldError: (testCase) => !testCase.post,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/sanity/blocks/blocks.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {IBlockSanityTestCase} from "./types";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {TreeBacked} from "@chainsafe/ssz";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {PresetName} from "@chainsafe/lodestar-params";
 
 export function runBlocks(presetName: PresetName): void {
@@ -59,7 +59,7 @@ export function runBlocks(presetName: PresetName): void {
       timeout: 10000,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/sanity/slots/slots.ts

@@ -5,7 +5,7 @@ import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {altair, allForks} from "@chainsafe/lodestar-beacon-state-transition";
 import {TreeBacked} from "@chainsafe/ssz";
 import {createIChainForkConfig} from "@chainsafe/lodestar-config";
-import {expectEqualBeaconState} from "../../util";
+import {expectEqualBeaconStateAltair} from "../../../util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {PresetName} from "@chainsafe/lodestar-params";
 
@@ -49,7 +49,7 @@ export function runSlots(presetName: PresetName): void {
       timeout: 10000,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/altair/transition/transition.ts

@@ -6,7 +6,7 @@ import {createIChainForkConfig} from "@chainsafe/lodestar-config";
 import {ITransitionTestCase} from "./types";
 import {SPEC_TEST_LOCATION} from "../../../utils/specTestCases";
 import {TreeBacked} from "@chainsafe/ssz";
-import {expectEqualBeaconState} from "../util";
+import {expectEqualBeaconStateAltair} from "../../util";
 import {PresetName} from "@chainsafe/lodestar-params";
 
 export function runTransition(presetName: PresetName): void {
@@ -65,7 +65,7 @@ export function runTransition(presetName: PresetName): void {
       timeout: 10000,
       getExpected: (testCase) => testCase.post,
       expectFunc: (testCase, expected, actual) => {
-        expectEqualBeaconState(expected, actual);
+        expectEqualBeaconStateAltair(expected, actual);
       },
     }
   );

packages/spec-test-runner/test/spec/phase0/epoch_processing/justification/justification_and_finalization_mainnet.test.ts

@@ -3,10 +3,10 @@ import {config} from "@chainsafe/lodestar-config/default";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {ssz} from "@chainsafe/lodestar-types";
 import {TreeBacked} from "@chainsafe/ssz";
-import {expect} from "chai";
 import {join} from "path";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {IStateTestCase} from "../../../../utils/specTestTypes/stateTestCase";
+import {expectEqualBeaconStatePhase0} from "../../../util";
 
 describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
   "epoch justification and finalization mainnet",
@@ -37,7 +37,7 @@ describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
     },
     getExpected: (testCase) => testCase.post,
     expectFunc: (testCase, expected, actual) => {
-      expect(ssz.phase0.BeaconState.equals(actual, expected)).to.be.true;
+      expectEqualBeaconStatePhase0(expected, actual);
     },
   }
 );

packages/spec-test-runner/test/spec/phase0/epoch_processing/registryUpdates/registry_updates_mainnet.test.ts

@@ -1,5 +1,4 @@
 import {join} from "path";
-import {expect} from "chai";
 
 import {TreeBacked} from "@chainsafe/ssz";
 import {config} from "@chainsafe/lodestar-config/default";
@@ -8,6 +7,7 @@ import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-tes
 import {IStateTestCase} from "../../../../utils/specTestTypes/stateTestCase";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {ssz} from "@chainsafe/lodestar-types";
+import {expectEqualBeaconStatePhase0} from "../../../util";
 
 describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
   "epoch registry updates mainnet",
@@ -38,7 +38,7 @@ describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
     },
     getExpected: (testCase) => testCase.post,
     expectFunc: (testCase, expected, actual) => {
-      expect(ssz.phase0.BeaconState.equals(actual, expected)).to.be.true;
+      expectEqualBeaconStatePhase0(expected, actual);
     },
   }
 );

packages/spec-test-runner/test/spec/phase0/epoch_processing/rewardsAndPenalties/rewards_and_penalties_minimal.test.ts

@@ -1,5 +1,4 @@
 import {join} from "path";
-import {expect} from "chai";
 
 import {TreeBacked} from "@chainsafe/ssz";
 import {config} from "@chainsafe/lodestar-config/default";
@@ -8,6 +7,7 @@ import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-tes
 import {IStateTestCase} from "../../../../utils/specTestTypes/stateTestCase";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {ssz} from "@chainsafe/lodestar-types";
+import {expectEqualBeaconStatePhase0} from "../../../util";
 
 describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
   "rewards and penalties minimal",
@@ -38,7 +38,7 @@ describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
     },
     getExpected: (testCase) => testCase.post,
     expectFunc: (testCase, expected, actual) => {
-      expect(ssz.phase0.BeaconState.equals(actual, expected)).to.be.true;
+      expectEqualBeaconStatePhase0(expected, actual);
     },
   }
 );

packages/spec-test-runner/test/spec/phase0/epoch_processing/slashings/slashings_mainnet.test.ts

@@ -1,5 +1,4 @@
 import {join} from "path";
-import {expect} from "chai";
 
 import {TreeBacked} from "@chainsafe/ssz";
 import {config} from "@chainsafe/lodestar-config/default";
@@ -8,6 +7,7 @@ import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-tes
 import {IStateTestCase} from "../../../../utils/specTestTypes/stateTestCase";
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
 import {ssz} from "@chainsafe/lodestar-types";
+import {expectEqualBeaconStatePhase0} from "../../../util";
 
 describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
   "epoch slashings mainnet",
@@ -38,7 +38,7 @@ describeDirectorySpecTest<IStateTestCase, phase0.BeaconState>(
     },
     getExpected: (testCase) => testCase.post,
     expectFunc: (testCase, expected, actual) => {
-      expect(ssz.phase0.BeaconState.equals(actual, expected)).to.be.true;
+      expectEqualBeaconStatePhase0(expected, actual);
     },
   }
 );

packages/spec-test-runner/test/spec/phase0/genesis/initialization/genesis_initialization_minimal.test.ts

@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import {join} from "path";
-import {expect} from "chai";
 import {config} from "@chainsafe/lodestar-config/default";
 import {phase0, Uint64, Root, ssz} from "@chainsafe/lodestar-types";
 import {describeDirectorySpecTest, InputType} from "@chainsafe/lodestar-spec-test-util";
 import {initializeBeaconStateFromEth1} from "@chainsafe/lodestar-beacon-state-transition";
 
 import {SPEC_TEST_LOCATION} from "../../../../utils/specTestCases";
+import {expectEqualBeaconStatePhase0} from "../../../util";
 
 interface IGenesisInitSpecTest {
   [k: string]: phase0.Deposit | unknown | null | undefined;
@@ -54,7 +54,7 @@ describeDirectorySpecTest<IGenesisInitSpecTest, phase0.BeaconState>(
     timeout: 60000,
     getExpected: (testCase) => testCase.state,
     expectFunc: (testCase, expected, actual) => {
-      expect(ssz.phase0.BeaconState.equals(actual, expected)).to.be.true;
+      expectEqualBeaconStatePhase0(expected, actual);
     },
     //shouldSkip: (_, __, index) => index !== 0,
   }