refactor: move testdata from pkg to testutil (#2296)

* chore: move testdata from pkg to testutil

* fix imports

* Add changelog entry

* Fix pathname in headers_test

---------

Co-authored-by: Lucas Bertrand <[email protected]>

changelog.md

@@ -39,6 +39,7 @@
 * [2262](https://github.com/zeta-chain/node/pull/2262) - refactor MsgUpdateZRC20 into MsgPauseZrc20 and MsgUnPauseZRC20
 * [2290](https://github.com/zeta-chain/node/pull/2290) - rename `MsgAddBlameVote` message to `MsgVoteBlame`
 * [2269](https://github.com/zeta-chain/node/pull/2269) - refactor MsgUpdateCrosschainFlags into MsgEnableCCTX, MsgDisableCCTX and MsgUpdateGasPriceIncreaseFlags
+* [2296](https://github.com/zeta-chain/node/pull/2296) - move `testdata` package to `testutil` to organize test-related utilities
 
 ### Tests
 

pkg/proofs/bitcoin/proof_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/btcsuite/btcutil"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 )
 
 func TestBitcoinMerkleProof(t *testing.T) {

pkg/proofs/ethereum/proof_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 )
 
 func TestProofGeneration(t *testing.T) {

pkg/proofs/headers_test.go

@@ -17,15 +17,15 @@ import (
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 )
 
 const numHeadersToTest = 100
 
 func TestTrueEthereumHeader(t *testing.T) {
 	var header ethtypes.Header
 	// read file into a byte slice
-	file, err := os.Open("../testdata/eth_header_18495266.json")
+	file, err := os.Open("../../testutil/testdata/eth_header_18495266.json")
 	require.NoError(t, err)
 	defer file.Close()
 	headerBytes := make([]byte, 4096)
@@ -52,7 +52,7 @@ func TestTrueEthereumHeader(t *testing.T) {
 func TestFalseEthereumHeader(t *testing.T) {
 	var header ethtypes.Header
 	// read file into a byte slice
-	file, err := os.Open("../testdata/eth_header_18495266.json")
+	file, err := os.Open("../../testutil/testdata/eth_header_18495266.json")
 	require.NoError(t, err)
 	defer file.Close()
 	headerBytes := make([]byte, 4096)

pkg/proofs/proof_test.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/zeta-chain/zetacore/pkg/proofs/bitcoin"
 	"github.com/zeta-chain/zetacore/pkg/proofs/ethereum"
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 )
 
 const (

testutil/sample/lightclient.go

@@ -11,7 +11,7 @@ import (
 	"github.com/zeta-chain/zetacore/pkg/chains"
 	"github.com/zeta-chain/zetacore/pkg/proofs"
 	"github.com/zeta-chain/zetacore/pkg/proofs/ethereum"
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 	lightclienttypes "github.com/zeta-chain/zetacore/x/lightclient/types"
 )
 

x/authority/client/cli/tx_update_chain_info_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/zeta-chain/zetacore/pkg/chains"
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 	"github.com/zeta-chain/zetacore/x/authority/client/cli"
 )
 

x/authority/client/cli/tx_update_policies_test.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/zeta-chain/zetacore/pkg/testdata"
+	"github.com/zeta-chain/zetacore/testutil/testdata"
 	"github.com/zeta-chain/zetacore/x/authority/client/cli"
 	authoritytypes "github.com/zeta-chain/zetacore/x/authority/types"
 )

x/observer/types/message_vote_block_header_test.go

@@ -20,7 +20,7 @@ import (
 func TestMsgVoteBlockHeader_ValidateBasic(t *testing.T) {
 	keeper.SetConfig(false)
 	var header ethtypes.Header
-	file, err := os.Open("../../../pkg/testdata/eth_header_18495266.json")
+	file, err := os.Open("../../../testutil/testdata/eth_header_18495266.json")
 	require.NoError(t, err)
 	defer file.Close()
 	headerBytes := make([]byte, 4096)

zetaclient/zetacore/tx_test.go

@@ -123,7 +123,7 @@ func MockBroadcastError(_ *Client, _ uint64, _ sdktypes.Msg, _ authz.Signer) (st
 
 func getHeaderData(t *testing.T) proofs.HeaderData {
 	var header ethtypes.Header
-	file, err := os.Open("../../pkg/testdata/eth_header_18495266.json")
+	file, err := os.Open("../../testutil/testdata/eth_header_18495266.json")
 	require.NoError(t, err)
 	defer file.Close()
 	headerBytes := make([]byte, 4096)