Skip to content

Commit 6714f0d

Browse files
util: test data migration (#3685)
Co-authored-by: Holger Drewes <[email protected]>
1 parent 647a518 commit 6714f0d

File tree

7 files changed

+962
-930
lines changed

7 files changed

+962
-930
lines changed

packages/util/test/account.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
utf8ToBytes,
3434
} from '../src/index.js'
3535

36-
import eip1014Testdata from './testdata/eip1014Examples.json'
36+
import { eip1404ExamplesData } from './testdata/eip1014Examples.js'
3737

3838
import type { AccountBodyBytes, AccountData, PrefixedHexString } from '../src/index.js'
3939
import type { Input } from '@ethereumjs/rlp'
@@ -538,7 +538,7 @@ describe('Utility Functions', () => {
538538
})
539539

540540
it('generateAddress2: EIP-1014 testdata examples', () => {
541-
for (const testdata of eip1014Testdata) {
541+
for (const testdata of eip1404ExamplesData) {
542542
const { address, comment, result, salt, initCode } = testdata
543543
const addr = generateAddress2(
544544
hexToBytes(address as PrefixedHexString),
@@ -550,7 +550,7 @@ describe('Utility Functions', () => {
550550
})
551551

552552
it('generateAddress2: non-buffer inputs', () => {
553-
const { address, salt, initCode } = eip1014Testdata[0]
553+
const { address, salt, initCode } = eip1404ExamplesData[0]
554554

555555
assert.throws(
556556
function () {

packages/util/test/address.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
toBytes,
1515
} from '../src/index.js'
1616

17-
import eip1014Testdata from './testdata/eip1014Examples.json'
17+
import { eip1404ExamplesData } from './testdata/eip1014Examples.js'
1818

1919
import type { PrefixedHexString } from '../src/index.js'
2020

@@ -103,7 +103,7 @@ describe('Address', () => {
103103
})
104104

105105
it('should generate address for CREATE2', () => {
106-
for (const testdata of eip1014Testdata) {
106+
for (const testdata of eip1404ExamplesData) {
107107
const { address, salt, initCode, result } = testdata
108108
const from = createAddressFromString(address)
109109
const addr = createContractAddress2(

packages/util/test/genesis.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import { assert, describe, it } from 'vitest'
33
import { parseGethGenesisState } from '../src/genesis.js'
44

55
// kiln genesis with deposit contract storage set
6-
import gethGenesisKilnJSON from './testdata/geth-genesis-kiln.json'
6+
import { gethGenesisKilnData } from './testdata/gethGenesisKiln.js'
77

88
describe('[Util/genesis]', () => {
99
it('should properly generate stateRoot from gethGenesis', () => {
10-
const genesisState = parseGethGenesisState(gethGenesisKilnJSON)
10+
const genesisState = parseGethGenesisState(gethGenesisKilnData)
1111
// just check for deposit contract inclusion
1212
assert.equal(
1313
genesisState['0x4242424242424242424242424242424242424242'][1].includes(

packages/util/test/testdata/eip1014Examples.json

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
export const eip1404ExamplesData = [
2+
{
3+
comment: 'Example 0',
4+
address: '0x0000000000000000000000000000000000000000',
5+
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
6+
initCode: '0x00',
7+
gas: '32006',
8+
result: '0x4d1a2e2bb4f88f0250f26ffff098b0b30b26bf38',
9+
},
10+
{
11+
comment: 'Example 1',
12+
address: '0xdeadbeef00000000000000000000000000000000',
13+
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
14+
initCode: '0x00',
15+
gas: '32006',
16+
result: '0xb928f69bb1d91cd65274e3c79d8986362984fda3',
17+
},
18+
{
19+
comment: 'Example 2',
20+
address: '0xdeadbeef00000000000000000000000000000000',
21+
salt: '0x000000000000000000000000feed000000000000000000000000000000000000',
22+
initCode: '0x00',
23+
gas: '32006',
24+
result: '0xd04116cdd17bebe565eb2422f2497e06cc1c9833',
25+
},
26+
{
27+
comment: 'Example 3',
28+
address: '0x0000000000000000000000000000000000000000',
29+
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
30+
initCode: '0xdeadbeef',
31+
gas: '32006',
32+
result: '0x70f2b2914a2a4b783faefb75f459a580616fcb5e',
33+
},
34+
{
35+
comment: 'Example 4',
36+
address: '0x00000000000000000000000000000000deadbeef',
37+
salt: '0x00000000000000000000000000000000000000000000000000000000cafebabe',
38+
initCode: '0xdeadbeef',
39+
gas: '32006',
40+
result: '0x60f3f640a8508fc6a86d45df051962668e1e8ac7',
41+
},
42+
{
43+
comment: 'Example 5',
44+
address: '0x00000000000000000000000000000000deadbeef',
45+
salt: '0x00000000000000000000000000000000000000000000000000000000cafebabe',
46+
initCode:
47+
'0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef',
48+
gas: '32012',
49+
result: '0x1d8bfdc5d46dc4f61d6b6115972536ebe6a8854c',
50+
},
51+
{
52+
comment: 'Example 6',
53+
address: '0x0000000000000000000000000000000000000000',
54+
salt: '0x0000000000000000000000000000000000000000000000000000000000000000',
55+
initCode: '0x',
56+
gas: '32000',
57+
result: '0xe33c0c7f7df4809055c3eba6c09cfe4baf1bd9e0',
58+
},
59+
]

0 commit comments

Comments
 (0)