Skip to content

Commit 68662c7

Browse files
committed
params/confp: move testdata out of internal/ dir
This data is used by packages internal, generic, and tconvert; its hierarchy should reflect being shared. Signed-off-by: meows <b5c6@protonmail.com>
1 parent ff7195a commit 68662c7

File tree

7 files changed

+6
-6
lines changed

7 files changed

+6
-6
lines changed

params/confp/generic/generic_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ func TestUnmarshalChainConfigurator(t *testing.T) {
1818
wantT interface{}
1919
}{
2020
{
21-
filepath.Join("..", "internal", "testdata", "stureby_parity.json"),
21+
filepath.Join("..", "testdata", "stureby_parity.json"),
2222
&parity.ParityChainSpec{},
2323
},
2424
{
25-
filepath.Join("..", "internal", "testdata", "stureby_geth.json"),
25+
filepath.Join("..", "testdata", "stureby_geth.json"),
2626
&goethereum.ChainConfig{},
2727
},
2828
{
29-
filepath.Join("..", "internal", "testdata", "stureby_multigeth.json"),
29+
filepath.Join("..", "testdata", "stureby_multigeth.json"),
3030
&multigeth.MultiGethChainConfig{},
3131
},
3232
}

params/confp/internal/convert_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
)
3939

4040
func mustOpenF(t *testing.T, fabbrev string, into interface{}) {
41-
b, err := ioutil.ReadFile(filepath.Join("testdata", fmt.Sprintf("stureby_%s.json", fabbrev)))
41+
b, err := ioutil.ReadFile(filepath.Join("..", "testdata", fmt.Sprintf("stureby_%s.json", fabbrev)))
4242
if err != nil {
4343
t.Fatal(err)
4444
}

params/confp/tconvert/aleth_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
func TestAlethSturebyConverter(t *testing.T) {
3434

3535
// Read GETH genesis type.
36-
blob, err := ioutil.ReadFile(filepath.Join("..", "internal", "testdata", "stureby_geth.json"))
36+
blob, err := ioutil.ReadFile(filepath.Join("..", "testdata", "stureby_geth.json"))
3737
if err != nil {
3838
t.Fatalf("could not read file: %v", err)
3939
}
@@ -49,7 +49,7 @@ func TestAlethSturebyConverter(t *testing.T) {
4949
}
5050

5151
// Read the aleth JSON spec.
52-
expBlob, err := ioutil.ReadFile(filepath.Join("..", "internal", "testdata", "stureby_aleth.json"))
52+
expBlob, err := ioutil.ReadFile(filepath.Join("..", "testdata", "stureby_aleth.json"))
5353
if err != nil {
5454
t.Fatalf("could not read file: %v", err)
5555
}

0 commit comments

Comments
 (0)