From f75e37a3eb9db4ed0e3ae4fe01ae9081124c97ec Mon Sep 17 00:00:00 2001 From: Callum Waters Date: Mon, 24 Apr 2023 14:58:56 +0200 Subject: [PATCH] chore!: consolidate test package (#1647) This PR consolidates our testing based packages into a single `test` package --- app/estimate_square_size_test.go | 4 ++-- app/test/check_tx_test.go | 4 ++-- app/test/fuzz_abci_test.go | 2 +- app/test/integration_test.go | 4 ++-- app/test/prepare_proposal_test.go | 6 +++--- app/test/process_proposal_test.go | 6 +++--- app/test/qgb_rpc_test.go | 2 +- app/test/std_sdk_test.go | 2 +- app/testutil_test.go | 4 ++-- app/write_square_test.go | 2 +- pkg/proof/proof_test.go | 2 +- pkg/shares/compact_shares_test.go | 2 +- pkg/shares/merge_test.go | 2 +- pkg/shares/parse_sparse_shares_test.go | 2 +- pkg/shares/sparse_shares_test.go | 2 +- pkg/shares/utils_test.go | 2 +- {testing => test}/tokenfilter/setup.go | 0 {testing => test}/tokenfilter/tokenfilter_test.go | 0 {testing => test}/txsim/account.go | 0 {testing => test}/txsim/blob.go | 2 +- {testing => test}/txsim/client.go | 0 {testing => test}/txsim/run.go | 0 {testing => test}/txsim/run_test.go | 4 ++-- {testing => test}/txsim/send.go | 0 {testing => test}/txsim/sequence.go | 0 {testing => test}/txsim/stake.go | 0 {testutil => test/util}/blobfactory/account_info.go | 0 {testutil => test/util}/blobfactory/payforblob_factory.go | 2 +- {testutil => test/util}/blobfactory/test_util.go | 2 +- {testutil => test/util}/common.go | 0 {testutil => test/util}/direct_tx_gen.go | 2 +- {testutil => test/util}/keeper/blob.go | 2 +- {testutil => test/util}/network/network.go | 0 {testutil => test/util}/test_app.go | 2 +- {testutil => test/util}/testfactory/blob.go | 0 {testutil => test/util}/testfactory/common.go | 0 {testutil => test/util}/testfactory/txs.go | 0 {testutil => test/util}/testfactory/utils.go | 0 {testutil => test/util}/testnode/full_node.go | 2 +- {testutil => test/util}/testnode/full_node_test.go | 2 +- {testutil => test/util}/testnode/node_init.go | 0 {testutil => test/util}/testnode/node_interaction_api.go | 0 {testutil => test/util}/testnode/read.go | 0 {testutil => test/util}/testnode/rpc_client.go | 0 {testutil => test/util}/testnode/sign.go | 0 x/blob/client/cli/testrandblob.go | 2 +- x/blob/client/testutil/integration_test.go | 4 ++-- x/blob/genesis_test.go | 2 +- x/blob/keeper/grpc_query_params_test.go | 2 +- x/blob/keeper/params_test.go | 2 +- x/blob/types/test/blob_tx_test.go | 2 +- x/qgb/abci_test.go | 2 +- x/qgb/keeper/keeper_data_commitment_test.go | 2 +- x/qgb/keeper/keeper_valset_test.go | 2 +- 54 files changed, 44 insertions(+), 44 deletions(-) rename {testing => test}/tokenfilter/setup.go (100%) rename {testing => test}/tokenfilter/tokenfilter_test.go (100%) rename {testing => test}/txsim/account.go (100%) rename {testing => test}/txsim/blob.go (98%) rename {testing => test}/txsim/client.go (100%) rename {testing => test}/txsim/run.go (100%) rename {testing => test}/txsim/run_test.go (97%) rename {testing => test}/txsim/send.go (100%) rename {testing => test}/txsim/sequence.go (100%) rename {testing => test}/txsim/stake.go (100%) rename {testutil => test/util}/blobfactory/account_info.go (100%) rename {testutil => test/util}/blobfactory/payforblob_factory.go (99%) rename {testutil => test/util}/blobfactory/test_util.go (97%) rename {testutil => test/util}/common.go (100%) rename {testutil => test/util}/direct_tx_gen.go (99%) rename {testutil => test/util}/keeper/blob.go (96%) rename {testutil => test/util}/network/network.go (100%) rename {testutil => test/util}/test_app.go (99%) rename {testutil => test/util}/testfactory/blob.go (100%) rename {testutil => test/util}/testfactory/common.go (100%) rename {testutil => test/util}/testfactory/txs.go (100%) rename {testutil => test/util}/testfactory/utils.go (100%) rename {testutil => test/util}/testnode/full_node.go (99%) rename {testutil => test/util}/testnode/full_node_test.go (98%) rename {testutil => test/util}/testnode/node_init.go (100%) rename {testutil => test/util}/testnode/node_interaction_api.go (100%) rename {testutil => test/util}/testnode/read.go (100%) rename {testutil => test/util}/testnode/rpc_client.go (100%) rename {testutil => test/util}/testnode/sign.go (100%) diff --git a/app/estimate_square_size_test.go b/app/estimate_square_size_test.go index 2556d02..79ac4c8 100644 --- a/app/estimate_square_size_test.go +++ b/app/estimate_square_size_test.go @@ -11,8 +11,8 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" "github.com/celestiaorg/celestia-app/pkg/shares" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" ) diff --git a/app/test/check_tx_test.go b/app/test/check_tx_test.go index 601fa92..45a9c02 100644 --- a/app/test/check_tx_test.go +++ b/app/test/check_tx_test.go @@ -7,8 +7,8 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + testutil "github.com/celestiaorg/celestia-app/test/util" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/app/test/fuzz_abci_test.go b/app/test/fuzz_abci_test.go index 1e8dfa9..5e145ea 100644 --- a/app/test/fuzz_abci_test.go +++ b/app/test/fuzz_abci_test.go @@ -6,7 +6,7 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" - "github.com/celestiaorg/celestia-app/testutil" + "github.com/celestiaorg/celestia-app/test/util" "github.com/stretchr/testify/require" abci "github.com/tendermint/tendermint/abci/types" tmrand "github.com/tendermint/tendermint/libs/rand" diff --git a/app/test/integration_test.go b/app/test/integration_test.go index 0b9aa51..6ca1df4 100644 --- a/app/test/integration_test.go +++ b/app/test/integration_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" "github.com/stretchr/testify/require" "github.com/cosmos/cosmos-sdk/client" @@ -21,7 +21,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" "github.com/celestiaorg/celestia-app/pkg/proof" - "github.com/celestiaorg/celestia-app/testutil/network" + "github.com/celestiaorg/celestia-app/test/util/network" "github.com/celestiaorg/celestia-app/x/blob" "github.com/celestiaorg/celestia-app/x/blob/types" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" diff --git a/app/test/prepare_proposal_test.go b/app/test/prepare_proposal_test.go index 667baa8..744735c 100644 --- a/app/test/prepare_proposal_test.go +++ b/app/test/prepare_proposal_test.go @@ -17,9 +17,9 @@ import ( "github.com/celestiaorg/celestia-app/app/encoding" "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + testutil "github.com/celestiaorg/celestia-app/test/util" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" ) diff --git a/app/test/process_proposal_test.go b/app/test/process_proposal_test.go index 1376a0d..91770a5 100644 --- a/app/test/process_proposal_test.go +++ b/app/test/process_proposal_test.go @@ -21,9 +21,9 @@ import ( "github.com/celestiaorg/celestia-app/pkg/da" appns "github.com/celestiaorg/celestia-app/pkg/namespace" "github.com/celestiaorg/celestia-app/pkg/shares" - "github.com/celestiaorg/celestia-app/testutil" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + testutil "github.com/celestiaorg/celestia-app/test/util" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" ) func TestProcessProposal(t *testing.T) { diff --git a/app/test/qgb_rpc_test.go b/app/test/qgb_rpc_test.go index eb4fe80..4f3e9a2 100644 --- a/app/test/qgb_rpc_test.go +++ b/app/test/qgb_rpc_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/celestiaorg/celestia-app/testutil/testnode" + "github.com/celestiaorg/celestia-app/test/util/testnode" "github.com/celestiaorg/celestia-app/x/qgb/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/app/test/std_sdk_test.go b/app/test/std_sdk_test.go index 97eb65b..5287d47 100644 --- a/app/test/std_sdk_test.go +++ b/app/test/std_sdk_test.go @@ -8,7 +8,7 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" - "github.com/celestiaorg/celestia-app/testutil/testnode" + "github.com/celestiaorg/celestia-app/test/util/testnode" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/testutil/mock" diff --git a/app/testutil_test.go b/app/testutil_test.go index 63e9938..4f8528d 100644 --- a/app/testutil_test.go +++ b/app/testutil_test.go @@ -8,8 +8,8 @@ import ( coretypes "github.com/tendermint/tendermint/types" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" ) func generateMixedTxs(normalTxCount, pfbCount, pfbSize int) ([][]byte, []tmproto.BlobTx) { diff --git a/app/write_square_test.go b/app/write_square_test.go index bd07b8f..42c3a6e 100644 --- a/app/write_square_test.go +++ b/app/write_square_test.go @@ -7,7 +7,7 @@ import ( appns "github.com/celestiaorg/celestia-app/pkg/namespace" "github.com/celestiaorg/celestia-app/pkg/shares" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" "github.com/stretchr/testify/require" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" coretypes "github.com/tendermint/tendermint/types" diff --git a/pkg/proof/proof_test.go b/pkg/proof/proof_test.go index cafda01..70f3a2c 100644 --- a/pkg/proof/proof_test.go +++ b/pkg/proof/proof_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/celestia-app/pkg/da" diff --git a/pkg/shares/compact_shares_test.go b/pkg/shares/compact_shares_test.go index 2c2f9c5..3ff5d16 100644 --- a/pkg/shares/compact_shares_test.go +++ b/pkg/shares/compact_shares_test.go @@ -8,7 +8,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" coretypes "github.com/tendermint/tendermint/types" diff --git a/pkg/shares/merge_test.go b/pkg/shares/merge_test.go index e11094e..8a9962e 100644 --- a/pkg/shares/merge_test.go +++ b/pkg/shares/merge_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/celestiaorg/celestia-app/pkg/appconsts" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/rsmt2d" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/shares/parse_sparse_shares_test.go b/pkg/shares/parse_sparse_shares_test.go index db06bbe..f66c501 100644 --- a/pkg/shares/parse_sparse_shares_test.go +++ b/pkg/shares/parse_sparse_shares_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/celestiaorg/celestia-app/pkg/appconsts" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/nmt/namespace" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/shares/sparse_shares_test.go b/pkg/shares/sparse_shares_test.go index 278cf43..30d7e35 100644 --- a/pkg/shares/sparse_shares_test.go +++ b/pkg/shares/sparse_shares_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/celestiaorg/celestia-app/pkg/appconsts" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" coretypes "github.com/tendermint/tendermint/types" diff --git a/pkg/shares/utils_test.go b/pkg/shares/utils_test.go index 49f30b9..c265f69 100644 --- a/pkg/shares/utils_test.go +++ b/pkg/shares/utils_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/types" diff --git a/testing/tokenfilter/setup.go b/test/tokenfilter/setup.go similarity index 100% rename from testing/tokenfilter/setup.go rename to test/tokenfilter/setup.go diff --git a/testing/tokenfilter/tokenfilter_test.go b/test/tokenfilter/tokenfilter_test.go similarity index 100% rename from testing/tokenfilter/tokenfilter_test.go rename to test/tokenfilter/tokenfilter_test.go diff --git a/testing/txsim/account.go b/test/txsim/account.go similarity index 100% rename from testing/txsim/account.go rename to test/txsim/account.go diff --git a/testing/txsim/blob.go b/test/txsim/blob.go similarity index 98% rename from testing/txsim/blob.go rename to test/txsim/blob.go index 7b0a580..4b31112 100644 --- a/testing/txsim/blob.go +++ b/test/txsim/blob.go @@ -7,7 +7,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" ns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" blob "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/cosmos/cosmos-sdk/types" "github.com/gogo/protobuf/grpc" diff --git a/testing/txsim/client.go b/test/txsim/client.go similarity index 100% rename from testing/txsim/client.go rename to test/txsim/client.go diff --git a/testing/txsim/run.go b/test/txsim/run.go similarity index 100% rename from testing/txsim/run.go rename to test/txsim/run.go diff --git a/testing/txsim/run_test.go b/test/txsim/run_test.go similarity index 97% rename from testing/txsim/run_test.go rename to test/txsim/run_test.go index 3dacf1c..58b56a5 100644 --- a/testing/txsim/run_test.go +++ b/test/txsim/run_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/celestiaorg/celestia-app/testing/txsim" - "github.com/celestiaorg/celestia-app/testutil/testnode" + "github.com/celestiaorg/celestia-app/test/txsim" + "github.com/celestiaorg/celestia-app/test/util/testnode" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/testing/txsim/send.go b/test/txsim/send.go similarity index 100% rename from testing/txsim/send.go rename to test/txsim/send.go diff --git a/testing/txsim/sequence.go b/test/txsim/sequence.go similarity index 100% rename from testing/txsim/sequence.go rename to test/txsim/sequence.go diff --git a/testing/txsim/stake.go b/test/txsim/stake.go similarity index 100% rename from testing/txsim/stake.go rename to test/txsim/stake.go diff --git a/testutil/blobfactory/account_info.go b/test/util/blobfactory/account_info.go similarity index 100% rename from testutil/blobfactory/account_info.go rename to test/util/blobfactory/account_info.go diff --git a/testutil/blobfactory/payforblob_factory.go b/test/util/blobfactory/payforblob_factory.go similarity index 99% rename from testutil/blobfactory/payforblob_factory.go rename to test/util/blobfactory/payforblob_factory.go index 844b497..15487fb 100644 --- a/testutil/blobfactory/payforblob_factory.go +++ b/test/util/blobfactory/payforblob_factory.go @@ -8,7 +8,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" "github.com/celestiaorg/celestia-app/pkg/namespace" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/celestia-app/x/blob/types" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" diff --git a/testutil/blobfactory/test_util.go b/test/util/blobfactory/test_util.go similarity index 97% rename from testutil/blobfactory/test_util.go rename to test/util/blobfactory/test_util.go index b69634e..eea5017 100644 --- a/testutil/blobfactory/test_util.go +++ b/test/util/blobfactory/test_util.go @@ -1,7 +1,7 @@ package blobfactory import ( - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/cosmos/cosmos-sdk/client" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/testutil/common.go b/test/util/common.go similarity index 100% rename from testutil/common.go rename to test/util/common.go diff --git a/testutil/direct_tx_gen.go b/test/util/direct_tx_gen.go similarity index 99% rename from testutil/direct_tx_gen.go rename to test/util/direct_tx_gen.go index 8e54cd7..7c3dc7e 100644 --- a/testutil/direct_tx_gen.go +++ b/test/util/direct_tx_gen.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/celestiaorg/celestia-app/app" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" blobtypes "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/cosmos/cosmos-sdk/crypto/keyring" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/testutil/keeper/blob.go b/test/util/keeper/blob.go similarity index 96% rename from testutil/keeper/blob.go rename to test/util/keeper/blob.go index e0dfb2f..40b7b79 100644 --- a/testutil/keeper/blob.go +++ b/test/util/keeper/blob.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - "github.com/celestiaorg/celestia-app/testutil" + testutil "github.com/celestiaorg/celestia-app/test/util" "github.com/celestiaorg/celestia-app/x/blob/keeper" "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/cosmos/cosmos-sdk/codec" diff --git a/testutil/network/network.go b/test/util/network/network.go similarity index 100% rename from testutil/network/network.go rename to test/util/network/network.go diff --git a/testutil/test_app.go b/test/util/test_app.go similarity index 99% rename from testutil/test_app.go rename to test/util/test_app.go index 6582e1d..02e15f2 100644 --- a/testutil/test_app.go +++ b/test/util/test_app.go @@ -7,7 +7,7 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/testutil/testfactory/blob.go b/test/util/testfactory/blob.go similarity index 100% rename from testutil/testfactory/blob.go rename to test/util/testfactory/blob.go diff --git a/testutil/testfactory/common.go b/test/util/testfactory/common.go similarity index 100% rename from testutil/testfactory/common.go rename to test/util/testfactory/common.go diff --git a/testutil/testfactory/txs.go b/test/util/testfactory/txs.go similarity index 100% rename from testutil/testfactory/txs.go rename to test/util/testfactory/txs.go diff --git a/testutil/testfactory/utils.go b/test/util/testfactory/utils.go similarity index 100% rename from testutil/testfactory/utils.go rename to test/util/testfactory/utils.go diff --git a/testutil/testnode/full_node.go b/test/util/testnode/full_node.go similarity index 99% rename from testutil/testnode/full_node.go rename to test/util/testnode/full_node.go index 3886b63..ada3b7b 100644 --- a/testutil/testnode/full_node.go +++ b/test/util/testnode/full_node.go @@ -31,7 +31,7 @@ import ( "github.com/celestiaorg/celestia-app/app" "github.com/celestiaorg/celestia-app/app/encoding" "github.com/celestiaorg/celestia-app/cmd/celestia-appd/cmd" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" ) // New creates a ready to use tendermint node that operates a single validator diff --git a/testutil/testnode/full_node_test.go b/test/util/testnode/full_node_test.go similarity index 98% rename from testutil/testnode/full_node_test.go rename to test/util/testnode/full_node_test.go index 40f4980..7de610f 100644 --- a/testutil/testnode/full_node_test.go +++ b/test/util/testnode/full_node_test.go @@ -8,7 +8,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/stretchr/testify/suite" abci "github.com/tendermint/tendermint/abci/types" diff --git a/testutil/testnode/node_init.go b/test/util/testnode/node_init.go similarity index 100% rename from testutil/testnode/node_init.go rename to test/util/testnode/node_init.go diff --git a/testutil/testnode/node_interaction_api.go b/test/util/testnode/node_interaction_api.go similarity index 100% rename from testutil/testnode/node_interaction_api.go rename to test/util/testnode/node_interaction_api.go diff --git a/testutil/testnode/read.go b/test/util/testnode/read.go similarity index 100% rename from testutil/testnode/read.go rename to test/util/testnode/read.go diff --git a/testutil/testnode/rpc_client.go b/test/util/testnode/rpc_client.go similarity index 100% rename from testutil/testnode/rpc_client.go rename to test/util/testnode/rpc_client.go diff --git a/testutil/testnode/sign.go b/test/util/testnode/sign.go similarity index 100% rename from testutil/testnode/sign.go rename to test/util/testnode/sign.go diff --git a/x/blob/client/cli/testrandblob.go b/x/blob/client/cli/testrandblob.go index a8d3d86..67e2aa0 100644 --- a/x/blob/client/cli/testrandblob.go +++ b/x/blob/client/cli/testrandblob.go @@ -6,7 +6,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/spf13/cobra" diff --git a/x/blob/client/testutil/integration_test.go b/x/blob/client/testutil/integration_test.go index 358d4b8..53addcd 100644 --- a/x/blob/client/testutil/integration_test.go +++ b/x/blob/client/testutil/integration_test.go @@ -19,8 +19,8 @@ import ( "github.com/celestiaorg/celestia-app/x/blob/types" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/network" - "github.com/celestiaorg/celestia-app/testutil/testfactory" + "github.com/celestiaorg/celestia-app/test/util/network" + "github.com/celestiaorg/celestia-app/test/util/testfactory" "github.com/celestiaorg/celestia-app/x/blob/client/cli" paycli "github.com/celestiaorg/celestia-app/x/blob/client/cli" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/blob/genesis_test.go b/x/blob/genesis_test.go index bb37aec..c21ebfb 100644 --- a/x/blob/genesis_test.go +++ b/x/blob/genesis_test.go @@ -3,7 +3,7 @@ package blob_test import ( "testing" - keepertest "github.com/celestiaorg/celestia-app/testutil/keeper" + keepertest "github.com/celestiaorg/celestia-app/test/util/keeper" "github.com/celestiaorg/celestia-app/x/blob" "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/stretchr/testify/require" diff --git a/x/blob/keeper/grpc_query_params_test.go b/x/blob/keeper/grpc_query_params_test.go index 52075f4..2fa47a7 100644 --- a/x/blob/keeper/grpc_query_params_test.go +++ b/x/blob/keeper/grpc_query_params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - testkeeper "github.com/celestiaorg/celestia-app/testutil/keeper" + testkeeper "github.com/celestiaorg/celestia-app/test/util/keeper" "github.com/celestiaorg/celestia-app/x/blob/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" diff --git a/x/blob/keeper/params_test.go b/x/blob/keeper/params_test.go index bf388fc..01abbbb 100644 --- a/x/blob/keeper/params_test.go +++ b/x/blob/keeper/params_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - testkeeper "github.com/celestiaorg/celestia-app/testutil/keeper" + testkeeper "github.com/celestiaorg/celestia-app/test/util/keeper" "github.com/celestiaorg/celestia-app/x/blob/types" "github.com/stretchr/testify/require" ) diff --git a/x/blob/types/test/blob_tx_test.go b/x/blob/types/test/blob_tx_test.go index 4eab44f..53208b8 100644 --- a/x/blob/types/test/blob_tx_test.go +++ b/x/blob/types/test/blob_tx_test.go @@ -9,7 +9,7 @@ import ( "github.com/celestiaorg/celestia-app/pkg/appconsts" "github.com/celestiaorg/celestia-app/pkg/namespace" appns "github.com/celestiaorg/celestia-app/pkg/namespace" - "github.com/celestiaorg/celestia-app/testutil/blobfactory" + "github.com/celestiaorg/celestia-app/test/util/blobfactory" "github.com/celestiaorg/celestia-app/x/blob/types" sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" diff --git a/x/qgb/abci_test.go b/x/qgb/abci_test.go index 9ce7380..08ac832 100644 --- a/x/qgb/abci_test.go +++ b/x/qgb/abci_test.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/teststaking" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/celestiaorg/celestia-app/testutil" + testutil "github.com/celestiaorg/celestia-app/test/util" "github.com/celestiaorg/celestia-app/x/qgb" "github.com/cosmos/cosmos-sdk/x/staking" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" diff --git a/x/qgb/keeper/keeper_data_commitment_test.go b/x/qgb/keeper/keeper_data_commitment_test.go index 342ec55..c20bb62 100644 --- a/x/qgb/keeper/keeper_data_commitment_test.go +++ b/x/qgb/keeper/keeper_data_commitment_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "testing" - "github.com/celestiaorg/celestia-app/testutil" + testutil "github.com/celestiaorg/celestia-app/test/util" "github.com/celestiaorg/celestia-app/x/qgb/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/qgb/keeper/keeper_valset_test.go b/x/qgb/keeper/keeper_valset_test.go index b081411..876fdc5 100644 --- a/x/qgb/keeper/keeper_valset_test.go +++ b/x/qgb/keeper/keeper_valset_test.go @@ -4,7 +4,7 @@ import ( "bytes" "testing" - "github.com/celestiaorg/celestia-app/testutil" + testutil "github.com/celestiaorg/celestia-app/test/util" "github.com/celestiaorg/celestia-app/x/qgb/types" gethcommon "github.com/ethereum/go-ethereum/common" "github.com/stretchr/testify/assert"