From 0bc86a3b4bb49b7c5e57152438e19c61edca2e9d Mon Sep 17 00:00:00 2001 From: yyforyongyu Date: Thu, 11 Aug 2022 19:39:40 +0800 Subject: [PATCH] multi: move `itest` out of `lntest` This commit moves all the test cases living in `itest` out of `lntest`, further making `lntest` an independent package for general testing. --- .gitignore | 12 ++++++------ Makefile | 16 ++++++++-------- docs/code_contribution_guidelines.md | 2 +- docs/musig2.md | 6 +++--- {lntest/itest => itest}/assertions.go | 0 {lntest/itest => itest}/list_off_test.go | 0 {lntest/itest => itest}/list_on_test.go | 0 {lntest/itest => itest}/lnd_amp_test.go | 0 .../itest => itest}/lnd_channel_backup_test.go | 0 .../itest => itest}/lnd_channel_balance_test.go | 0 .../lnd_channel_force_close_test.go | 0 .../itest => itest}/lnd_channel_graph_test.go | 0 .../itest => itest}/lnd_channel_policy_test.go | 0 {lntest/itest => itest}/lnd_custom_message.go | 0 .../itest => itest}/lnd_etcd_failover_test.go | 0 .../lnd_forward_interceptor_test.go | 0 {lntest/itest => itest}/lnd_funding_test.go | 0 .../lnd_hold_invoice_force_test.go | 0 .../itest => itest}/lnd_hold_persistence_test.go | 0 {lntest/itest => itest}/lnd_macaroons_test.go | 0 .../itest => itest}/lnd_max_channel_size_test.go | 0 {lntest/itest => itest}/lnd_max_htlcs_test.go | 0 {lntest/itest => itest}/lnd_misc_test.go | 0 {lntest/itest => itest}/lnd_mpp_test.go | 0 .../lnd_multi-hop-error-propagation_test.go | 0 .../lnd_multi-hop-payments_test.go | 0 {lntest/itest => itest}/lnd_multi-hop_test.go | 0 {lntest/itest => itest}/lnd_network_test.go | 0 {lntest/itest => itest}/lnd_neutrino_test.go | 0 .../lnd_no_etcd_dummy_failover_test.go | 0 {lntest/itest => itest}/lnd_nonstd_sweep_test.go | 0 {lntest/itest => itest}/lnd_onchain_test.go | 0 {lntest/itest => itest}/lnd_open_channel_test.go | 0 {lntest/itest => itest}/lnd_payment_test.go | 0 {lntest/itest => itest}/lnd_psbt_test.go | 0 {lntest/itest => itest}/lnd_recovery_test.go | 0 .../itest => itest}/lnd_remote_signer_test.go | 0 {lntest/itest => itest}/lnd_res_handoff_test.go | 0 {lntest/itest => itest}/lnd_rest_api_test.go | 0 {lntest/itest => itest}/lnd_revocation_test.go | 0 {lntest/itest => itest}/lnd_routing_test.go | 0 .../lnd_rpc_middleware_interceptor_test.go | 0 .../lnd_send_multi_path_payment_test.go | 0 {lntest/itest => itest}/lnd_signer_test.go | 0 .../lnd_single_hop_invoice_test.go | 0 {lntest/itest => itest}/lnd_switch_test.go | 0 {lntest/itest => itest}/lnd_taproot_test.go | 0 {lntest/itest => itest}/lnd_test.go | 0 .../itest => itest}/lnd_trackpayments_test.go | 0 .../itest => itest}/lnd_wallet_import_test.go | 0 {lntest/itest => itest}/lnd_wipe_fwdpkgs_test.go | 0 .../itest => itest}/lnd_wumbo_channels_test.go | 0 {lntest/itest => itest}/lnd_zero_conf_test.go | 0 {lntest/itest => itest}/log_check_errors.sh | 0 {lntest/itest => itest}/log_error_whitelist.txt | 0 {lntest/itest => itest}/log_substitutions.txt | 0 {lntest/itest => itest}/test_harness.go | 0 {lntest/itest => itest}/utils.go | 0 scripts/itest_part.sh | 2 +- 59 files changed, 19 insertions(+), 19 deletions(-) rename {lntest/itest => itest}/assertions.go (100%) rename {lntest/itest => itest}/list_off_test.go (100%) rename {lntest/itest => itest}/list_on_test.go (100%) rename {lntest/itest => itest}/lnd_amp_test.go (100%) rename {lntest/itest => itest}/lnd_channel_backup_test.go (100%) rename {lntest/itest => itest}/lnd_channel_balance_test.go (100%) rename {lntest/itest => itest}/lnd_channel_force_close_test.go (100%) rename {lntest/itest => itest}/lnd_channel_graph_test.go (100%) rename {lntest/itest => itest}/lnd_channel_policy_test.go (100%) rename {lntest/itest => itest}/lnd_custom_message.go (100%) rename {lntest/itest => itest}/lnd_etcd_failover_test.go (100%) rename {lntest/itest => itest}/lnd_forward_interceptor_test.go (100%) rename {lntest/itest => itest}/lnd_funding_test.go (100%) rename {lntest/itest => itest}/lnd_hold_invoice_force_test.go (100%) rename {lntest/itest => itest}/lnd_hold_persistence_test.go (100%) rename {lntest/itest => itest}/lnd_macaroons_test.go (100%) rename {lntest/itest => itest}/lnd_max_channel_size_test.go (100%) rename {lntest/itest => itest}/lnd_max_htlcs_test.go (100%) rename {lntest/itest => itest}/lnd_misc_test.go (100%) rename {lntest/itest => itest}/lnd_mpp_test.go (100%) rename {lntest/itest => itest}/lnd_multi-hop-error-propagation_test.go (100%) rename {lntest/itest => itest}/lnd_multi-hop-payments_test.go (100%) rename {lntest/itest => itest}/lnd_multi-hop_test.go (100%) rename {lntest/itest => itest}/lnd_network_test.go (100%) rename {lntest/itest => itest}/lnd_neutrino_test.go (100%) rename {lntest/itest => itest}/lnd_no_etcd_dummy_failover_test.go (100%) rename {lntest/itest => itest}/lnd_nonstd_sweep_test.go (100%) rename {lntest/itest => itest}/lnd_onchain_test.go (100%) rename {lntest/itest => itest}/lnd_open_channel_test.go (100%) rename {lntest/itest => itest}/lnd_payment_test.go (100%) rename {lntest/itest => itest}/lnd_psbt_test.go (100%) rename {lntest/itest => itest}/lnd_recovery_test.go (100%) rename {lntest/itest => itest}/lnd_remote_signer_test.go (100%) rename {lntest/itest => itest}/lnd_res_handoff_test.go (100%) rename {lntest/itest => itest}/lnd_rest_api_test.go (100%) rename {lntest/itest => itest}/lnd_revocation_test.go (100%) rename {lntest/itest => itest}/lnd_routing_test.go (100%) rename {lntest/itest => itest}/lnd_rpc_middleware_interceptor_test.go (100%) rename {lntest/itest => itest}/lnd_send_multi_path_payment_test.go (100%) rename {lntest/itest => itest}/lnd_signer_test.go (100%) rename {lntest/itest => itest}/lnd_single_hop_invoice_test.go (100%) rename {lntest/itest => itest}/lnd_switch_test.go (100%) rename {lntest/itest => itest}/lnd_taproot_test.go (100%) rename {lntest/itest => itest}/lnd_test.go (100%) rename {lntest/itest => itest}/lnd_trackpayments_test.go (100%) rename {lntest/itest => itest}/lnd_wallet_import_test.go (100%) rename {lntest/itest => itest}/lnd_wipe_fwdpkgs_test.go (100%) rename {lntest/itest => itest}/lnd_wumbo_channels_test.go (100%) rename {lntest/itest => itest}/lnd_zero_conf_test.go (100%) rename {lntest/itest => itest}/log_check_errors.sh (100%) rename {lntest/itest => itest}/log_error_whitelist.txt (100%) rename {lntest/itest => itest}/log_substitutions.txt (100%) rename {lntest/itest => itest}/test_harness.go (100%) rename {lntest/itest => itest}/utils.go (100%) diff --git a/.gitignore b/.gitignore index 106af84c2..16d33c142 100644 --- a/.gitignore +++ b/.gitignore @@ -32,12 +32,12 @@ _testmain.go /lncli-itest # Integration test log files -lntest/itest/*.log -lntest/itest/.backendlogs -lntest/itest/.minerlogs -lntest/itest/lnd-itest -lntest/itest/btcd-itest -lntest/itest/.logs-* +itest/*.log +itest/.backendlogs +itest/.minerlogs +itest/lnd-itest +itest/btcd-itest +itest/.logs-* cmd/cmd *.key diff --git a/Makefile b/Makefile index 174fe0f03..9e4b174dc 100644 --- a/Makefile +++ b/Makefile @@ -93,19 +93,19 @@ build: build-itest: @$(call print, "Building itest btcd and lnd.") - CGO_ENABLED=0 $(GOBUILD) -tags="rpctest" -o lntest/itest/btcd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(BTCD_PKG) - CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o lntest/itest/lnd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(PKG)/cmd/lnd + CGO_ENABLED=0 $(GOBUILD) -tags="rpctest" -o itest/btcd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(BTCD_PKG) + CGO_ENABLED=0 $(GOBUILD) -tags="$(ITEST_TAGS)" -o itest/lnd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(PKG)/cmd/lnd @$(call print, "Building itest binary for ${backend} backend.") - CGO_ENABLED=0 $(GOTEST) -v ./lntest/itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -c -o lntest/itest/itest.test$(EXEC_SUFFIX) + CGO_ENABLED=0 $(GOTEST) -v ./itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -c -o itest/itest.test$(EXEC_SUFFIX) build-itest-race: @$(call print, "Building itest btcd and lnd with race detector.") - CGO_ENABLED=0 $(GOBUILD) -tags="rpctest" -o lntest/itest/btcd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(BTCD_PKG) - CGO_ENABLED=1 $(GOBUILD) -race -tags="$(ITEST_TAGS)" -o lntest/itest/lnd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(PKG)/cmd/lnd + CGO_ENABLED=0 $(GOBUILD) -tags="rpctest" -o itest/btcd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(BTCD_PKG) + CGO_ENABLED=1 $(GOBUILD) -race -tags="$(ITEST_TAGS)" -o itest/lnd-itest$(EXEC_SUFFIX) $(DEV_LDFLAGS) $(PKG)/cmd/lnd @$(call print, "Building itest binary for ${backend} backend.") - CGO_ENABLED=0 $(GOTEST) -v ./lntest/itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -c -o lntest/itest/itest.test$(EXEC_SUFFIX) + CGO_ENABLED=0 $(GOTEST) -v ./itest -tags="$(DEV_TAGS) $(RPC_TAGS) rpctest $(backend)" -c -o itest/itest.test$(EXEC_SUFFIX) install: @$(call print, "Installing lnd and lncli.") @@ -164,7 +164,7 @@ endif itest-only: db-instance @$(call print, "Running integration tests with ${backend} backend.") - rm -rf lntest/itest/*.log lntest/itest/.logs-*; date + rm -rf itest/*.log itest/.logs-*; date EXEC_SUFFIX=$(EXEC_SUFFIX) scripts/itest_part.sh 0 1 $(TEST_FLAGS) $(ITEST_FLAGS) itest: build-itest itest-only @@ -173,7 +173,7 @@ itest-race: build-itest-race itest-only itest-parallel: build-itest db-instance @$(call print, "Running tests") - rm -rf lntest/itest/*.log lntest/itest/.logs-*; date + rm -rf itest/*.log itest/.logs-*; date EXEC_SUFFIX=$(EXEC_SUFFIX) echo "$$(seq 0 $$(expr $(ITEST_PARALLELISM) - 1))" | xargs -P $(ITEST_PARALLELISM) -n 1 -I {} scripts/itest_part.sh {} $(NUM_ITEST_TRANCHES) $(TEST_FLAGS) $(ITEST_FLAGS) itest-clean: diff --git a/docs/code_contribution_guidelines.md b/docs/code_contribution_guidelines.md index 8a13d371d..79f03df65 100644 --- a/docs/code_contribution_guidelines.md +++ b/docs/code_contribution_guidelines.md @@ -155,7 +155,7 @@ A quick summary of test practices follows: or RPC's will need to be accompanied by integration tests which use the [`networkHarness`framework](https://github.com/lightningnetwork/lnd/blob/master/lntest/harness.go) contained within `lnd`. For example integration tests, see - [`lnd_test.go`](https://github.com/lightningnetwork/lnd/blob/master/lntest/itest/lnd_test.go). + [`lnd_test.go`](https://github.com/lightningnetwork/lnd/blob/master/itest/lnd_test.go). - The itest log files are automatically scanned for `[ERR]` lines. There shouldn't be any of those in the logs, see [Use of Log Levels](#use-of-log-levels). diff --git a/docs/musig2.md b/docs/musig2.md index e46398832..555dfd7ec 100644 --- a/docs/musig2.md +++ b/docs/musig2.md @@ -44,7 +44,7 @@ to test the RPCs and to showcase the different use cases. ### 3-of-3 Taproot key spend path (BIP-0086) See `testTaprootMuSig2KeySpendBip86` in -[`lntest/itest/lnd_taproot_test.go`](../lntest/itest/lnd_taproot_test.go) to see +[`itest/lnd_taproot_test.go`](../itest/lnd_taproot_test.go) to see the full code. This example uses combines the public keys of 3 participants into a shared @@ -73,7 +73,7 @@ the `MuSig2CreateSession` RPC call: ### 3-of-3 Taproot key spend path with root hash commitment See `testTaprootMuSig2KeySpendRootHash` in -[`lntest/itest/lnd_taproot_test.go`](../lntest/itest/lnd_taproot_test.go) to see +[`itest/lnd_taproot_test.go`](../itest/lnd_taproot_test.go) to see the full code. This is very similar to the above example but with the main difference that the @@ -101,7 +101,7 @@ the `MuSig2CreateSession` RPC call: ### 3-of-3 `OP_CHECKSIG` in Taproot script spend path See `testTaprootMuSig2CombinedLeafKeySpend` in -[`lntest/itest/lnd_taproot_test.go`](../lntest/itest/lnd_taproot_test.go) to see +[`itest/lnd_taproot_test.go`](../itest/lnd_taproot_test.go) to see the full code. This example is definitely the most involved one. To be able to use a MuSig2 diff --git a/lntest/itest/assertions.go b/itest/assertions.go similarity index 100% rename from lntest/itest/assertions.go rename to itest/assertions.go diff --git a/lntest/itest/list_off_test.go b/itest/list_off_test.go similarity index 100% rename from lntest/itest/list_off_test.go rename to itest/list_off_test.go diff --git a/lntest/itest/list_on_test.go b/itest/list_on_test.go similarity index 100% rename from lntest/itest/list_on_test.go rename to itest/list_on_test.go diff --git a/lntest/itest/lnd_amp_test.go b/itest/lnd_amp_test.go similarity index 100% rename from lntest/itest/lnd_amp_test.go rename to itest/lnd_amp_test.go diff --git a/lntest/itest/lnd_channel_backup_test.go b/itest/lnd_channel_backup_test.go similarity index 100% rename from lntest/itest/lnd_channel_backup_test.go rename to itest/lnd_channel_backup_test.go diff --git a/lntest/itest/lnd_channel_balance_test.go b/itest/lnd_channel_balance_test.go similarity index 100% rename from lntest/itest/lnd_channel_balance_test.go rename to itest/lnd_channel_balance_test.go diff --git a/lntest/itest/lnd_channel_force_close_test.go b/itest/lnd_channel_force_close_test.go similarity index 100% rename from lntest/itest/lnd_channel_force_close_test.go rename to itest/lnd_channel_force_close_test.go diff --git a/lntest/itest/lnd_channel_graph_test.go b/itest/lnd_channel_graph_test.go similarity index 100% rename from lntest/itest/lnd_channel_graph_test.go rename to itest/lnd_channel_graph_test.go diff --git a/lntest/itest/lnd_channel_policy_test.go b/itest/lnd_channel_policy_test.go similarity index 100% rename from lntest/itest/lnd_channel_policy_test.go rename to itest/lnd_channel_policy_test.go diff --git a/lntest/itest/lnd_custom_message.go b/itest/lnd_custom_message.go similarity index 100% rename from lntest/itest/lnd_custom_message.go rename to itest/lnd_custom_message.go diff --git a/lntest/itest/lnd_etcd_failover_test.go b/itest/lnd_etcd_failover_test.go similarity index 100% rename from lntest/itest/lnd_etcd_failover_test.go rename to itest/lnd_etcd_failover_test.go diff --git a/lntest/itest/lnd_forward_interceptor_test.go b/itest/lnd_forward_interceptor_test.go similarity index 100% rename from lntest/itest/lnd_forward_interceptor_test.go rename to itest/lnd_forward_interceptor_test.go diff --git a/lntest/itest/lnd_funding_test.go b/itest/lnd_funding_test.go similarity index 100% rename from lntest/itest/lnd_funding_test.go rename to itest/lnd_funding_test.go diff --git a/lntest/itest/lnd_hold_invoice_force_test.go b/itest/lnd_hold_invoice_force_test.go similarity index 100% rename from lntest/itest/lnd_hold_invoice_force_test.go rename to itest/lnd_hold_invoice_force_test.go diff --git a/lntest/itest/lnd_hold_persistence_test.go b/itest/lnd_hold_persistence_test.go similarity index 100% rename from lntest/itest/lnd_hold_persistence_test.go rename to itest/lnd_hold_persistence_test.go diff --git a/lntest/itest/lnd_macaroons_test.go b/itest/lnd_macaroons_test.go similarity index 100% rename from lntest/itest/lnd_macaroons_test.go rename to itest/lnd_macaroons_test.go diff --git a/lntest/itest/lnd_max_channel_size_test.go b/itest/lnd_max_channel_size_test.go similarity index 100% rename from lntest/itest/lnd_max_channel_size_test.go rename to itest/lnd_max_channel_size_test.go diff --git a/lntest/itest/lnd_max_htlcs_test.go b/itest/lnd_max_htlcs_test.go similarity index 100% rename from lntest/itest/lnd_max_htlcs_test.go rename to itest/lnd_max_htlcs_test.go diff --git a/lntest/itest/lnd_misc_test.go b/itest/lnd_misc_test.go similarity index 100% rename from lntest/itest/lnd_misc_test.go rename to itest/lnd_misc_test.go diff --git a/lntest/itest/lnd_mpp_test.go b/itest/lnd_mpp_test.go similarity index 100% rename from lntest/itest/lnd_mpp_test.go rename to itest/lnd_mpp_test.go diff --git a/lntest/itest/lnd_multi-hop-error-propagation_test.go b/itest/lnd_multi-hop-error-propagation_test.go similarity index 100% rename from lntest/itest/lnd_multi-hop-error-propagation_test.go rename to itest/lnd_multi-hop-error-propagation_test.go diff --git a/lntest/itest/lnd_multi-hop-payments_test.go b/itest/lnd_multi-hop-payments_test.go similarity index 100% rename from lntest/itest/lnd_multi-hop-payments_test.go rename to itest/lnd_multi-hop-payments_test.go diff --git a/lntest/itest/lnd_multi-hop_test.go b/itest/lnd_multi-hop_test.go similarity index 100% rename from lntest/itest/lnd_multi-hop_test.go rename to itest/lnd_multi-hop_test.go diff --git a/lntest/itest/lnd_network_test.go b/itest/lnd_network_test.go similarity index 100% rename from lntest/itest/lnd_network_test.go rename to itest/lnd_network_test.go diff --git a/lntest/itest/lnd_neutrino_test.go b/itest/lnd_neutrino_test.go similarity index 100% rename from lntest/itest/lnd_neutrino_test.go rename to itest/lnd_neutrino_test.go diff --git a/lntest/itest/lnd_no_etcd_dummy_failover_test.go b/itest/lnd_no_etcd_dummy_failover_test.go similarity index 100% rename from lntest/itest/lnd_no_etcd_dummy_failover_test.go rename to itest/lnd_no_etcd_dummy_failover_test.go diff --git a/lntest/itest/lnd_nonstd_sweep_test.go b/itest/lnd_nonstd_sweep_test.go similarity index 100% rename from lntest/itest/lnd_nonstd_sweep_test.go rename to itest/lnd_nonstd_sweep_test.go diff --git a/lntest/itest/lnd_onchain_test.go b/itest/lnd_onchain_test.go similarity index 100% rename from lntest/itest/lnd_onchain_test.go rename to itest/lnd_onchain_test.go diff --git a/lntest/itest/lnd_open_channel_test.go b/itest/lnd_open_channel_test.go similarity index 100% rename from lntest/itest/lnd_open_channel_test.go rename to itest/lnd_open_channel_test.go diff --git a/lntest/itest/lnd_payment_test.go b/itest/lnd_payment_test.go similarity index 100% rename from lntest/itest/lnd_payment_test.go rename to itest/lnd_payment_test.go diff --git a/lntest/itest/lnd_psbt_test.go b/itest/lnd_psbt_test.go similarity index 100% rename from lntest/itest/lnd_psbt_test.go rename to itest/lnd_psbt_test.go diff --git a/lntest/itest/lnd_recovery_test.go b/itest/lnd_recovery_test.go similarity index 100% rename from lntest/itest/lnd_recovery_test.go rename to itest/lnd_recovery_test.go diff --git a/lntest/itest/lnd_remote_signer_test.go b/itest/lnd_remote_signer_test.go similarity index 100% rename from lntest/itest/lnd_remote_signer_test.go rename to itest/lnd_remote_signer_test.go diff --git a/lntest/itest/lnd_res_handoff_test.go b/itest/lnd_res_handoff_test.go similarity index 100% rename from lntest/itest/lnd_res_handoff_test.go rename to itest/lnd_res_handoff_test.go diff --git a/lntest/itest/lnd_rest_api_test.go b/itest/lnd_rest_api_test.go similarity index 100% rename from lntest/itest/lnd_rest_api_test.go rename to itest/lnd_rest_api_test.go diff --git a/lntest/itest/lnd_revocation_test.go b/itest/lnd_revocation_test.go similarity index 100% rename from lntest/itest/lnd_revocation_test.go rename to itest/lnd_revocation_test.go diff --git a/lntest/itest/lnd_routing_test.go b/itest/lnd_routing_test.go similarity index 100% rename from lntest/itest/lnd_routing_test.go rename to itest/lnd_routing_test.go diff --git a/lntest/itest/lnd_rpc_middleware_interceptor_test.go b/itest/lnd_rpc_middleware_interceptor_test.go similarity index 100% rename from lntest/itest/lnd_rpc_middleware_interceptor_test.go rename to itest/lnd_rpc_middleware_interceptor_test.go diff --git a/lntest/itest/lnd_send_multi_path_payment_test.go b/itest/lnd_send_multi_path_payment_test.go similarity index 100% rename from lntest/itest/lnd_send_multi_path_payment_test.go rename to itest/lnd_send_multi_path_payment_test.go diff --git a/lntest/itest/lnd_signer_test.go b/itest/lnd_signer_test.go similarity index 100% rename from lntest/itest/lnd_signer_test.go rename to itest/lnd_signer_test.go diff --git a/lntest/itest/lnd_single_hop_invoice_test.go b/itest/lnd_single_hop_invoice_test.go similarity index 100% rename from lntest/itest/lnd_single_hop_invoice_test.go rename to itest/lnd_single_hop_invoice_test.go diff --git a/lntest/itest/lnd_switch_test.go b/itest/lnd_switch_test.go similarity index 100% rename from lntest/itest/lnd_switch_test.go rename to itest/lnd_switch_test.go diff --git a/lntest/itest/lnd_taproot_test.go b/itest/lnd_taproot_test.go similarity index 100% rename from lntest/itest/lnd_taproot_test.go rename to itest/lnd_taproot_test.go diff --git a/lntest/itest/lnd_test.go b/itest/lnd_test.go similarity index 100% rename from lntest/itest/lnd_test.go rename to itest/lnd_test.go diff --git a/lntest/itest/lnd_trackpayments_test.go b/itest/lnd_trackpayments_test.go similarity index 100% rename from lntest/itest/lnd_trackpayments_test.go rename to itest/lnd_trackpayments_test.go diff --git a/lntest/itest/lnd_wallet_import_test.go b/itest/lnd_wallet_import_test.go similarity index 100% rename from lntest/itest/lnd_wallet_import_test.go rename to itest/lnd_wallet_import_test.go diff --git a/lntest/itest/lnd_wipe_fwdpkgs_test.go b/itest/lnd_wipe_fwdpkgs_test.go similarity index 100% rename from lntest/itest/lnd_wipe_fwdpkgs_test.go rename to itest/lnd_wipe_fwdpkgs_test.go diff --git a/lntest/itest/lnd_wumbo_channels_test.go b/itest/lnd_wumbo_channels_test.go similarity index 100% rename from lntest/itest/lnd_wumbo_channels_test.go rename to itest/lnd_wumbo_channels_test.go diff --git a/lntest/itest/lnd_zero_conf_test.go b/itest/lnd_zero_conf_test.go similarity index 100% rename from lntest/itest/lnd_zero_conf_test.go rename to itest/lnd_zero_conf_test.go diff --git a/lntest/itest/log_check_errors.sh b/itest/log_check_errors.sh similarity index 100% rename from lntest/itest/log_check_errors.sh rename to itest/log_check_errors.sh diff --git a/lntest/itest/log_error_whitelist.txt b/itest/log_error_whitelist.txt similarity index 100% rename from lntest/itest/log_error_whitelist.txt rename to itest/log_error_whitelist.txt diff --git a/lntest/itest/log_substitutions.txt b/itest/log_substitutions.txt similarity index 100% rename from lntest/itest/log_substitutions.txt rename to itest/log_substitutions.txt diff --git a/lntest/itest/test_harness.go b/itest/test_harness.go similarity index 100% rename from lntest/itest/test_harness.go rename to itest/test_harness.go diff --git a/lntest/itest/utils.go b/itest/utils.go similarity index 100% rename from lntest/itest/utils.go rename to itest/utils.go diff --git a/scripts/itest_part.sh b/scripts/itest_part.sh index c086c9af0..37a8a4659 100755 --- a/scripts/itest_part.sh +++ b/scripts/itest_part.sh @@ -1,7 +1,7 @@ #!/bin/bash # Let's work with absolute paths only, we run in the itest directory itself. -WORKDIR=$(pwd)/lntest/itest +WORKDIR=$(pwd)/itest TRANCHE=$1 NUM_TRANCHES=$2