refactor(v8): make internal/ public (#1038)

* move version out of internal/ * blockdb, dockerutil, mocktesting * make private methods public for usage
strangelove-ventures · Apr 9, 2024 · 99bcbc1 · 99bcbc1
1 parent 1c05790
commit 99bcbc1
Show file tree

Hide file tree

Showing 85 changed files with 93 additions and 341 deletions.
diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ help: ## Print this help message
 
 .PHONY: interchaintest
 interchaintest: gen ## Build interchaintest binary into ./bin
-	go test -ldflags "-X github.com/strangelove-ventures/interchaintest/v8/internal/version.GitSha=$(shell git describe --always --dirty)" -c -o ./bin/interchaintest ./cmd/interchaintest
+	go test -ldflags "-X github.com/strangelove-ventures/interchaintest/v8/interchaintest.GitSha=$(shell git describe --always --dirty)" -c -o ./bin/interchaintest ./cmd/interchaintest
 
 .PHONY: test
 test: ## Run unit tests

diff --git a/internal/blockdb/chain.go → blockdb/chain.go b/internal/blockdb/chain.go → blockdb/chain.go
diff --git a/internal/blockdb/chain_test.go → blockdb/chain_test.go b/internal/blockdb/chain_test.go → blockdb/chain_test.go
diff --git a/internal/blockdb/collect.go → blockdb/collect.go b/internal/blockdb/collect.go → blockdb/collect.go
diff --git a/internal/blockdb/collect_test.go → blockdb/collect_test.go b/internal/blockdb/collect_test.go → blockdb/collect_test.go
diff --git a/internal/blockdb/doc.go → blockdb/doc.go b/internal/blockdb/doc.go → blockdb/doc.go
diff --git a/internal/blockdb/messages_view_test.go → blockdb/messages_view_test.go b/internal/blockdb/messages_view_test.go → blockdb/messages_view_test.go
diff --git a/internal/blockdb/migrate.go → blockdb/migrate.go b/internal/blockdb/migrate.go → blockdb/migrate.go
diff --git a/internal/blockdb/migrate_test.go → blockdb/migrate_test.go b/internal/blockdb/migrate_test.go → blockdb/migrate_test.go
diff --git a/internal/blockdb/query.go → blockdb/query.go b/internal/blockdb/query.go → blockdb/query.go
diff --git a/internal/blockdb/query_test.go → blockdb/query_test.go b/internal/blockdb/query_test.go → blockdb/query_test.go
diff --git a/internal/blockdb/sql.go → blockdb/sql.go b/internal/blockdb/sql.go → blockdb/sql.go
diff --git a/internal/blockdb/sql_test.go → blockdb/sql_test.go b/internal/blockdb/sql_test.go → blockdb/sql_test.go
diff --git a/internal/blockdb/test_case.go → blockdb/test_case.go b/internal/blockdb/test_case.go → blockdb/test_case.go
diff --git a/internal/blockdb/test_case_test.go → blockdb/test_case_test.go b/internal/blockdb/test_case_test.go → blockdb/test_case_test.go
diff --git a/internal/blockdb/testdata/README.md → blockdb/testdata/README.md b/internal/blockdb/testdata/README.md → blockdb/testdata/README.md
diff --git a/internal/blockdb/testdata/sample_txs.json → blockdb/testdata/sample_txs.json b/internal/blockdb/testdata/sample_txs.json → blockdb/testdata/sample_txs.json
diff --git a/internal/blockdb/tui/help.go → blockdb/tui/help.go b/internal/blockdb/tui/help.go → blockdb/tui/help.go
diff --git a/internal/blockdb/tui/maincontent_string.go → blockdb/tui/maincontent_string.go b/internal/blockdb/tui/maincontent_string.go → blockdb/tui/maincontent_string.go
diff --git a/internal/blockdb/tui/model.go → blockdb/tui/model.go b/internal/blockdb/tui/model.go → blockdb/tui/model.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/atotto/clipboard"
 	"github.com/rivo/tview"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 )
 
 //go:generate go run golang.org/x/tools/cmd/stringer -type=mainContent

diff --git a/internal/blockdb/tui/model_test.go → blockdb/tui/model_test.go b/internal/blockdb/tui/model_test.go → blockdb/tui/model_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/...l/blockdb/tui/presenter/cosmos_message.go → blockdb/tui/presenter/cosmos_message.go b/...l/blockdb/tui/presenter/cosmos_message.go → blockdb/tui/presenter/cosmos_message.go
@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 )
 
 // CosmosMessage presents a blockdb.CosmosMessageResult.

diff --git a/...ckdb/tui/presenter/cosmos_message_test.go → blockdb/tui/presenter/cosmos_message_test.go b/...ckdb/tui/presenter/cosmos_message_test.go → blockdb/tui/presenter/cosmos_message_test.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"testing"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/internal/blockdb/tui/presenter/highlight.go → blockdb/tui/presenter/highlight.go b/internal/blockdb/tui/presenter/highlight.go → blockdb/tui/presenter/highlight.go
diff --git a/...l/blockdb/tui/presenter/highlight_test.go → blockdb/tui/presenter/highlight_test.go b/...l/blockdb/tui/presenter/highlight_test.go → blockdb/tui/presenter/highlight_test.go
diff --git a/internal/blockdb/tui/presenter/test_case.go → blockdb/tui/presenter/test_case.go b/internal/blockdb/tui/presenter/test_case.go → blockdb/tui/presenter/test_case.go
@@ -3,7 +3,7 @@ package presenter
 import (
 	"strconv"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 )
 
 // TestCase presents a blockdb.TestCaseResult.

diff --git a/...l/blockdb/tui/presenter/test_case_test.go → blockdb/tui/presenter/test_case_test.go b/...l/blockdb/tui/presenter/test_case_test.go → blockdb/tui/presenter/test_case_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/internal/blockdb/tui/presenter/time.go → blockdb/tui/presenter/time.go b/internal/blockdb/tui/presenter/time.go → blockdb/tui/presenter/time.go
diff --git a/internal/blockdb/tui/presenter/tx.go → blockdb/tui/presenter/tx.go b/internal/blockdb/tui/presenter/tx.go → blockdb/tui/presenter/tx.go
@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"sync"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 )
 
 var bufPool = sync.Pool{New: func() any { return new(bytes.Buffer) }}

diff --git a/internal/blockdb/tui/presenter/tx_test.go → blockdb/tui/presenter/tx_test.go b/internal/blockdb/tui/presenter/tx_test.go → blockdb/tui/presenter/tx_test.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/internal/blockdb/tui/style.go → blockdb/tui/style.go b/internal/blockdb/tui/style.go → blockdb/tui/style.go
diff --git a/internal/blockdb/tui/update.go → blockdb/tui/update.go b/internal/blockdb/tui/update.go → blockdb/tui/update.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb/tui/presenter"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb/tui/presenter"
 )
 
 // Update should be the argument for *(tview.Application).SetInputCapture.

diff --git a/internal/blockdb/tui/update_test.go → blockdb/tui/update_test.go b/internal/blockdb/tui/update_test.go → blockdb/tui/update_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/internal/blockdb/tui/views.go → blockdb/tui/views.go b/internal/blockdb/tui/views.go → blockdb/tui/views.go
@@ -8,8 +8,8 @@ import (
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/rivo/tview"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb/tui/presenter"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb/tui/presenter"
 )
 
 func headerView(m *Model) *tview.Flex {

diff --git a/internal/blockdb/views_test.go → blockdb/views_test.go b/internal/blockdb/views_test.go → blockdb/views_test.go
diff --git a/chain/cosmos/broadcaster.go b/chain/cosmos/broadcaster.go
@@ -15,7 +15,7 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/tx/signing"
 	authtx "github.com/cosmos/cosmos-sdk/x/auth/tx"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 )
 

diff --git a/chain/cosmos/chain_node.go b/chain/cosmos/chain_node.go
@@ -36,9 +36,9 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 )
 

diff --git a/chain/cosmos/cosmos_chain.go b/chain/cosmos/cosmos_chain.go
@@ -28,11 +28,11 @@ import (
 	dockertypes "github.com/docker/docker/api/types"
 	volumetypes "github.com/docker/docker/api/types/volume"
 	"github.com/docker/docker/client"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	wasmtypes "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos/08-wasm-types"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/internal/tendermint"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"

diff --git a/chain/cosmos/module_gov.go b/chain/cosmos/module_gov.go
@@ -12,7 +12,7 @@ import (
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
 	paramsutils "github.com/cosmos/cosmos-sdk/x/params/client/utils"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 )
 
 // VoteOnProposal submits a vote for the specified proposal.

diff --git a/chain/cosmos/module_vesting.go b/chain/cosmos/module_vesting.go
@@ -7,7 +7,7 @@ import (
 	"path"
 
 	vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 )
 
 // VestingCreateAccount creates a new vesting account funded with an allocation of tokens. The account can either be a delayed or continuous vesting account, which is determined by the '--delayed' flag.

diff --git a/chain/cosmos/osmosis.go b/chain/cosmos/osmosis.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 )
 
 // OsmosisPoolParams defines parameters for creating an osmosis gamm liquidity pool

diff --git a/chain/cosmos/sidecar.go b/chain/cosmos/sidecar.go
@@ -9,8 +9,8 @@ import (
 	"github.com/docker/go-connections/nat"
 	"go.uber.org/zap"
 
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 )
 
 type SidecarProcesses []*SidecarProcess

diff --git a/chain/ethereum/ethererum_chain.go b/chain/ethereum/ethererum_chain.go
@@ -17,8 +17,8 @@ import (
 	"github.com/docker/docker/api/types/volume"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"go.uber.org/zap"
 )

diff --git a/chain/ethereum/forge.go b/chain/ethereum/forge.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 
 	"github.com/docker/docker/api/types/mount"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 )
 
 // cli options for the `forge script` command

diff --git a/chain/internal/tendermint/tendermint_node.go b/chain/internal/tendermint/tendermint_node.go
@@ -18,8 +18,8 @@ import (
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/hashicorp/go-version"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"go.uber.org/zap"
 )

diff --git a/chain/penumbra/penumbra_app_node.go b/chain/penumbra/penumbra_app_node.go
@@ -12,8 +12,8 @@ import (
 	"github.com/docker/docker/client"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"go.uber.org/zap"
 )
 

diff --git a/chain/penumbra/penumbra_chain.go b/chain/penumbra/penumbra_chain.go
@@ -18,8 +18,8 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/internal/tendermint"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"

diff --git a/chain/penumbra/penumbra_client_node.go b/chain/penumbra/penumbra_client_node.go
@@ -17,8 +17,8 @@ import (
 	cryptov1alpha1 "github.com/strangelove-ventures/interchaintest/v8/chain/penumbra/core/crypto/v1alpha1"
 	custodyv1alpha1 "github.com/strangelove-ventures/interchaintest/v8/chain/penumbra/custody/v1alpha1"
 	viewv1alpha1 "github.com/strangelove-ventures/interchaintest/v8/chain/penumbra/view/v1alpha1"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

diff --git a/chain/polkadot/parachain_node.go b/chain/polkadot/parachain_node.go
@@ -16,8 +16,8 @@ import (
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	gsrpc "github.com/misko9/go-substrate-rpc-client/v4"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"go.uber.org/zap"
 )
 

diff --git a/chain/polkadot/polkadot_chain.go b/chain/polkadot/polkadot_chain.go
@@ -22,9 +22,9 @@ import (
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/misko9/go-substrate-rpc-client/v4/signature"
 	gstypes "github.com/misko9/go-substrate-rpc-client/v4/types"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"
 )

diff --git a/chain/polkadot/relay_chain_node.go b/chain/polkadot/relay_chain_node.go
@@ -19,8 +19,8 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/decred/dcrd/dcrec/secp256k1/v2"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 )
 
 // RelayChainNode defines the properties required for running a polkadot relay chain node.

diff --git a/chainset.go b/chainset.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/client"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
 	"golang.org/x/sync/errgroup"

diff --git a/cmd/interchaintest/interchaintest_test.go b/cmd/interchaintest/interchaintest_test.go
@@ -13,11 +13,10 @@ import (
 
 	"github.com/rivo/tview"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
+	"github.com/strangelove-ventures/interchaintest/v8/blockdb"
+	blockdbtui "github.com/strangelove-ventures/interchaintest/v8/blockdb/tui"
 	"github.com/strangelove-ventures/interchaintest/v8/conformance"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/blockdb"
-	blockdbtui "github.com/strangelove-ventures/interchaintest/v8/internal/blockdb/tui"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/version"
 	"github.com/strangelove-ventures/interchaintest/v8/relayer"
 	"github.com/strangelove-ventures/interchaintest/v8/testreporter"
 	"go.uber.org/zap"
@@ -63,7 +62,7 @@ func TestMain(m *testing.M) {
 		}
 		os.Exit(0)
 	case "version":
-		fmt.Fprintln(os.Stderr, version.GitSha)
+		fmt.Fprintln(os.Stderr, interchaintest.GitSha)
 		os.Exit(0)
 	}
 
@@ -276,7 +275,7 @@ func runDebugTerminalUI(ctx context.Context) error {
 	}
 	defer db.Close()
 
-	if err = blockdb.Migrate(db, version.GitSha); err != nil {
+	if err = blockdb.Migrate(db, interchaintest.GitSha); err != nil {
 		return fmt.Errorf("migrate database %s: %w", dbPath, err)
 	}
 

diff --git a/conformance/test.go b/conformance/test.go
@@ -40,8 +40,8 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/strangelove-ventures/interchaintest/v8"
 	"github.com/strangelove-ventures/interchaintest/v8/chain/cosmos"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/ibc"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
 	"github.com/strangelove-ventures/interchaintest/v8/relayer"
 	"github.com/strangelove-ventures/interchaintest/v8/testreporter"
 	"github.com/strangelove-ventures/interchaintest/v8/testutil"

diff --git a/internal/dockerutil/busybox.go → dockerutil/busybox.go b/internal/dockerutil/busybox.go → dockerutil/busybox.go
@@ -23,7 +23,7 @@ var (
 
 const busyboxRef = "busybox:stable"
 
-func ensureBusybox(ctx context.Context, cli *client.Client) error {
+func EnsureBusybox(ctx context.Context, cli *client.Client) error {
 	ensureBusyboxMu.Lock()
 	defer ensureBusyboxMu.Unlock()
 

diff --git a/internal/dockerutil/container_lifecycle.go → dockerutil/container_lifecycle.go b/internal/dockerutil/container_lifecycle.go → dockerutil/container_lifecycle.go
diff --git a/internal/dockerutil/doc.go → dockerutil/doc.go b/internal/dockerutil/doc.go → dockerutil/doc.go
diff --git a/internal/dockerutil/file.go → dockerutil/file.go b/internal/dockerutil/file.go → dockerutil/file.go
diff --git a/internal/dockerutil/fileretriever.go → dockerutil/fileretriever.go b/internal/dockerutil/fileretriever.go → dockerutil/fileretriever.go
@@ -34,7 +34,7 @@ func NewFileRetriever(log *zap.Logger, cli *client.Client, testName string) *Fil
 func (r *FileRetriever) SingleFileContent(ctx context.Context, volumeName, relPath string) ([]byte, error) {
 	const mountPath = "/mnt/dockervolume"
 
-	if err := ensureBusybox(ctx, r.cli); err != nil {
+	if err := EnsureBusybox(ctx, r.cli); err != nil {
 		return nil, err
 	}
 

diff --git a/internal/dockerutil/fileretriever_test.go → dockerutil/fileretriever_test.go b/internal/dockerutil/fileretriever_test.go → dockerutil/fileretriever_test.go
@@ -6,7 +6,7 @@ import (
 
 	volumetypes "github.com/docker/docker/api/types/volume"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )

diff --git a/internal/dockerutil/filewriter.go → dockerutil/filewriter.go b/internal/dockerutil/filewriter.go → dockerutil/filewriter.go
@@ -32,7 +32,7 @@ func NewFileWriter(log *zap.Logger, cli *client.Client, testName string) *FileWr
 func (w *FileWriter) WriteFile(ctx context.Context, volumeName, relPath string, content []byte) error {
 	const mountPath = "/mnt/dockervolume"
 
-	if err := ensureBusybox(ctx, w.cli); err != nil {
+	if err := EnsureBusybox(ctx, w.cli); err != nil {
 		return err
 	}
 

diff --git a/internal/dockerutil/filewriter_test.go → dockerutil/filewriter_test.go b/internal/dockerutil/filewriter_test.go → dockerutil/filewriter_test.go
@@ -6,7 +6,7 @@ import (
 
 	volumetypes "github.com/docker/docker/api/types/volume"
 	interchaintest "github.com/strangelove-ventures/interchaintest/v8"
-	"github.com/strangelove-ventures/interchaintest/v8/internal/dockerutil"
+	"github.com/strangelove-ventures/interchaintest/v8/dockerutil"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zaptest"
 )