Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(v7): make dockerutil internal/ public #1102

Merged
merged 4 commits into from
May 1, 2024
Merged

refactor(v7): make dockerutil internal/ public #1102

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d88116e
migrate internal/ to outside (ref #1038)
Reecepbcups Apr 28, 2024
af2dc4a
mv: blockdb & mocktesting back into internal/
Reecepbcups Apr 30, 2024
f5a5dfc
Merge branch 'v7' into reece/make-v7-public
Reecepbcups Apr 30, 2024
7be6bd7
internal/ version
Reecepbcups May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chain/cosmos/broadcaster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
)

Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/chain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ import (

icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
ccvclient "github.com/cosmos/interchain-security/v3/x/ccv/provider/client"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/blockdb"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
)

Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/cosmos_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import (
"github.com/icza/dyno"
wasmtypes "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos/08-wasm-types"
"github.com/strangelove-ventures/interchaintest/v7/chain/internal/tendermint"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/blockdb"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"go.uber.org/zap"
"golang.org/x/mod/semver"
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/osmosis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"path/filepath"
"strings"

"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
)

// OsmosisPoolParams defines parameters for creating an osmosis gamm liquidity pool
Expand Down
2 changes: 1 addition & 1 deletion chain/cosmos/sidecar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/docker/go-connections/nat"
"go.uber.org/zap"

"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
)

type SidecarProcesses []*SidecarProcess
Expand Down
2 changes: 1 addition & 1 deletion chain/ethereum/ethererum_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion chain/internal/tendermint/tendermint_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
dockerclient "github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/hashicorp/go-version"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"go.uber.org/zap"
)
Expand Down
2 changes: 1 addition & 1 deletion chain/penumbra/penumbra_app_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (

"github.com/docker/docker/client"
"github.com/docker/go-connections/nat"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion chain/penumbra/penumbra_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"github.com/docker/docker/client"
dockerclient "github.com/docker/docker/client"
"github.com/strangelove-ventures/interchaintest/v7/chain/internal/tendermint"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/parachain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/polkadot_chain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/blockdb"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"go.uber.org/zap"
"golang.org/x/sync/errgroup"
)
Expand Down
2 changes: 1 addition & 1 deletion chain/polkadot/relay_chain_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"go.uber.org/zap"

"github.com/decred/dcrd/dcrec/secp256k1/v2"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
)

// RelayChainNode defines the properties required for running a polkadot relay chain node.
Expand Down
5 changes: 2 additions & 3 deletions cmd/interchaintest/interchaintest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/blockdb"
blockdbtui "github.com/strangelove-ventures/interchaintest/v7/internal/blockdb/tui"
"github.com/strangelove-ventures/interchaintest/v7/internal/version"
"github.com/strangelove-ventures/interchaintest/v7/relayer"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"
"go.uber.org/zap"
Expand Down Expand Up @@ -65,7 +64,7 @@ func TestMain(m *testing.M) {
}
os.Exit(0)
case "version":
fmt.Fprintln(os.Stderr, version.GitSha)
fmt.Fprintln(os.Stderr, interchaintest.GitSha)
Reecepbcups marked this conversation as resolved.
Show resolved Hide resolved
os.Exit(0)
}

Expand Down Expand Up @@ -278,7 +277,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)
}

Expand Down
2 changes: 1 addition & 1 deletion conformance/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ import (
"github.com/docker/docker/client"
"github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/relayer"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
Expand Down
0 internal/dockerutil/busybox.go → dockerutil/busybox.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/container_lifecycle.go → dockerutil/container_lifecycle.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/doc.go → dockerutil/doc.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/file.go → dockerutil/file.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/fileretriever.go → dockerutil/fileretriever.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/dockerutil/fileretriever_test.go → dockerutil/fileretriever_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

volumetypes "github.com/docker/docker/api/types/volume"
interchaintest "github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
)
Expand Down
0 internal/dockerutil/filewriter.go → dockerutil/filewriter.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/dockerutil/filewriter_test.go → dockerutil/filewriter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

volumetypes "github.com/docker/docker/api/types/volume"
interchaintest "github.com/strangelove-ventures/interchaintest/v7"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/stretchr/testify/require"
"go.uber.org/zap/zaptest"
)
Expand Down
0 internal/dockerutil/image.go → dockerutil/image.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/image_test.go → dockerutil/image_test.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/keyring.go → dockerutil/keyring.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/ports.go → dockerutil/ports.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/setup.go → dockerutil/setup.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/dockerutil/setup_test.go → dockerutil/setup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

volumetypes "github.com/docker/docker/api/types/volume"
"github.com/docker/docker/errdefs"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/internal/mocktesting"
"github.com/stretchr/testify/require"
)
Expand Down
0 internal/dockerutil/startcontainer.go → dockerutil/startcontainer.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/strings.go → dockerutil/strings.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/strings_test.go → dockerutil/strings_test.go
View file
Open in desktop
File renamed without changes.
0 internal/dockerutil/volumeowner.go → dockerutil/volumeowner.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion examples/ibc/wasm/wasm_icq_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/strangelove-ventures/interchaintest/v7"
cosmosChain "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos/wasm"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/relayer"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
Expand Down
2 changes: 1 addition & 1 deletion relayer/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/docker/docker/pkg/stdcopy"
"go.uber.org/zap"

"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
)

Expand Down
5 changes: 2 additions & 3 deletions test_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import (
"time"

"github.com/docker/docker/client"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/internal/version"
"github.com/strangelove-ventures/interchaintest/v7/testreporter"
)

Expand Down Expand Up @@ -74,7 +73,7 @@ func StartChainPair(
TestName: t.Name(),
Client: cli,
NetworkID: networkID,
GitSha: version.GitSha,
GitSha: GitSha,
Reecepbcups marked this conversation as resolved.
Show resolved Hide resolved
BlockDatabaseFile: blockSqlite,
}); err != nil {
return nil, err
Expand Down
2 changes: 1 addition & 1 deletion test_user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"

"cosmossdk.io/math"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/ibc"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/testutil"
"github.com/stretchr/testify/require"
"golang.org/x/sync/errgroup"
Expand Down
2 changes: 1 addition & 1 deletion testutil/toml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/BurntSushi/toml"
"github.com/docker/docker/client"
"github.com/strangelove-ventures/interchaintest/v7/internal/dockerutil"
"github.com/strangelove-ventures/interchaintest/v7/dockerutil"
"go.uber.org/zap"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/version/version.go → version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package version
package interchaintest

Reecepbcups marked this conversation as resolved.
Show resolved Hide resolved
// GitSha is the git commit that produced the executable.
// Set via the project Makefile `make interchaintest`.
Expand Down
Loading