diff --git a/core/appconfig/config.go b/core/appconfig/config.go
index 513c764406..27db644ecf 100644
--- a/core/appconfig/config.go
+++ b/core/appconfig/config.go
@@ -14,7 +14,7 @@ import (
appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
"cosmossdk.io/core/internal"
)
diff --git a/core/appconfig/config_test.go b/core/appconfig/config_test.go
index d241be39a8..c1af334351 100644
--- a/core/appconfig/config_test.go
+++ b/core/appconfig/config_test.go
@@ -12,7 +12,7 @@ import (
"cosmossdk.io/core/internal"
"cosmossdk.io/core/internal/testpb"
_ "cosmossdk.io/core/internal/testpb"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
func expectContainerErrorContains(t *testing.T, option depinject.Config, contains string) {
diff --git a/core/appmodule/option.go b/core/appmodule/option.go
index c55201bfd3..ee1ee6492f 100644
--- a/core/appmodule/option.go
+++ b/core/appmodule/option.go
@@ -2,7 +2,7 @@ package appmodule
import (
"cosmossdk.io/core/internal"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
// Option is a functional option for implementing modules.
diff --git a/core/go.mod b/core/go.mod
index bb456cda6d..a5e7a119f7 100644
--- a/core/go.mod
+++ b/core/go.mod
@@ -5,7 +5,7 @@ go 1.18
require (
cosmossdk.io/api v0.1.0-alpha8
github.com/cosmos/cosmos-proto v1.0.0-alpha7
- github.com/cosmos/cosmos-sdk/depinject v1.0.0-alpha.4
+ cosmossdk.io/depinject v1.0.0-alpha.4
google.golang.org/protobuf v1.28.0
gotest.tools/v3 v3.2.0
sigs.k8s.io/yaml v1.3.0
@@ -28,5 +28,5 @@ require (
replace (
cosmossdk.io/api => ../api
- github.com/cosmos/cosmos-sdk/depinject => ../depinject
+ cosmossdk.io/depinject => ../depinject
)
diff --git a/core/internal/registry.go b/core/internal/registry.go
index 49693f8e83..beb8a54463 100644
--- a/core/internal/registry.go
+++ b/core/internal/registry.go
@@ -9,7 +9,7 @@ import (
appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
// ModuleRegistry is the registry of module initializers indexed by their golang
diff --git a/core/internal/testpb/modules.go b/core/internal/testpb/modules.go
index 358f4b90e5..52e8b6bb1f 100644
--- a/core/internal/testpb/modules.go
+++ b/core/internal/testpb/modules.go
@@ -6,7 +6,7 @@ import (
"sort"
"cosmossdk.io/core/appmodule"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
func init() {
diff --git a/depinject/binding_test.go b/depinject/binding_test.go
index c7dccb4fde..be07b9ab52 100644
--- a/depinject/binding_test.go
+++ b/depinject/binding_test.go
@@ -10,7 +10,7 @@ import (
"github.com/regen-network/gocuke"
"github.com/stretchr/testify/assert"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
func TestBindInterface(t *testing.T) {
@@ -120,7 +120,7 @@ func (s *bindingSuite) ThereIsNoError() {
}
func fullTypeName(typeName string) string {
- return fmt.Sprintf("github.com/cosmos/cosmos-sdk/depinject_test/depinject_test.%s", typeName)
+ return fmt.Sprintf("cosmossdk.io/depinject_test/depinject_test.%s", typeName)
}
func (s *bindingSuite) ThereIsAGlobalBindingForA(preferredType string, interfaceType string) {
diff --git a/depinject/config.go b/depinject/config.go
index 0584c27b47..e489e28a5a 100644
--- a/depinject/config.go
+++ b/depinject/config.go
@@ -92,8 +92,8 @@ func invoke(ctr *container, key *moduleKey, invokers []interface{}) error {
// instance when an interface of type Duck is requested as an input.
//
// BindInterface(
-// "github.com/cosmos/cosmos-sdk/depinject_test/depinject_test.Duck",
-// "github.com/cosmos/cosmos-sdk/depinject_test/depinject_test.Canvasback")
+// "cosmossdk.io/depinject_test/depinject_test.Duck",
+// "cosmossdk.io/depinject_test/depinject_test.Canvasback")
func BindInterface(inTypeName string, outTypeName string) Config {
return containerConfig(func(ctr *container) error {
return bindInterface(ctr, inTypeName, outTypeName, "")
@@ -107,8 +107,8 @@ func BindInterface(inTypeName string, outTypeName string) Config {
//
// BindInterfaceInModule(
// "moduleFoo",
-// "github.com/cosmos/cosmos-sdk/depinject_test/depinject_test.Duck",
-// "github.com/cosmos/cosmos-sdk/depinject_test/depinject_test.Canvasback")
+// "cosmossdk.io/depinject_test/depinject_test.Duck",
+// "cosmossdk.io/depinject_test/depinject_test.Canvasback")
func BindInterfaceInModule(moduleName string, inTypeName string, outTypeName string) Config {
return containerConfig(func(ctr *container) error {
return bindInterface(ctr, inTypeName, outTypeName, moduleName)
diff --git a/depinject/container.go b/depinject/container.go
index 189405ece4..90b24f1444 100644
--- a/depinject/container.go
+++ b/depinject/container.go
@@ -7,7 +7,7 @@ import (
"github.com/pkg/errors"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
type container struct {
diff --git a/depinject/container_test.go b/depinject/container_test.go
index c1db90d779..16fc2ad3ec 100644
--- a/depinject/container_test.go
+++ b/depinject/container_test.go
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"gotest.tools/v3/golden"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
type KVStoreKey struct {
diff --git a/depinject/debug.go b/depinject/debug.go
index fc4d52c8d3..afbacb30af 100644
--- a/depinject/debug.go
+++ b/depinject/debug.go
@@ -6,7 +6,7 @@ import (
"path/filepath"
"reflect"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
// DebugOption is a functional option for running a container that controls
diff --git a/depinject/go.mod b/depinject/go.mod
index 7e738836e6..cb648c9548 100644
--- a/depinject/go.mod
+++ b/depinject/go.mod
@@ -1,4 +1,4 @@
-module github.com/cosmos/cosmos-sdk/depinject
+module cosmossdk.io/depinject
go 1.18
diff --git a/depinject/group.go b/depinject/group.go
index 4656b1c29b..b2e0a22ddf 100644
--- a/depinject/group.go
+++ b/depinject/group.go
@@ -6,7 +6,7 @@ import (
"github.com/pkg/errors"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
// ManyPerContainerType marks a type which automatically gets grouped together. For an ManyPerContainerType T,
diff --git a/depinject/internal/graphviz/attrs.go b/depinject/internal/graphviz/attrs.go
index 5cd788911c..dab9cc0385 100644
--- a/depinject/internal/graphviz/attrs.go
+++ b/depinject/internal/graphviz/attrs.go
@@ -4,7 +4,7 @@ import (
"fmt"
"strings"
- "github.com/cosmos/cosmos-sdk/depinject/internal/util"
+ "cosmossdk.io/depinject/internal/util"
)
// Attributes represents a graphviz attributes map.
diff --git a/depinject/internal/graphviz/graph.go b/depinject/internal/graphviz/graph.go
index baa1d177f4..dc5a702c7b 100644
--- a/depinject/internal/graphviz/graph.go
+++ b/depinject/internal/graphviz/graph.go
@@ -6,7 +6,7 @@ import (
"fmt"
"io"
- "github.com/cosmos/cosmos-sdk/depinject/internal/util"
+ "cosmossdk.io/depinject/internal/util"
)
// Graph represents a graphviz digraph.
diff --git a/depinject/invoke_test.go b/depinject/invoke_test.go
index 5d7822d4c8..69dec08c57 100644
--- a/depinject/invoke_test.go
+++ b/depinject/invoke_test.go
@@ -6,7 +6,7 @@ import (
"github.com/regen-network/gocuke"
"gotest.tools/v3/assert"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
func TestInvoke(t *testing.T) {
diff --git a/depinject/module_dep.go b/depinject/module_dep.go
index 643cb55630..08cf0f81bf 100644
--- a/depinject/module_dep.go
+++ b/depinject/module_dep.go
@@ -3,7 +3,7 @@ package depinject
import (
"reflect"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
type moduleDepProvider struct {
diff --git a/depinject/one_per_module.go b/depinject/one_per_module.go
index 26ce1f0c39..28d65f21f1 100644
--- a/depinject/one_per_module.go
+++ b/depinject/one_per_module.go
@@ -6,7 +6,7 @@ import (
"github.com/pkg/errors"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
// OnePerModuleType marks a type which
diff --git a/depinject/provider_desc_test.go b/depinject/provider_desc_test.go
index 26a478e707..a768e87876 100644
--- a/depinject/provider_desc_test.go
+++ b/depinject/provider_desc_test.go
@@ -4,7 +4,7 @@ import (
"reflect"
"testing"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
)
type StructIn struct {
diff --git a/depinject/resolver.go b/depinject/resolver.go
index 9355df3c17..352b7bf11e 100644
--- a/depinject/resolver.go
+++ b/depinject/resolver.go
@@ -3,7 +3,7 @@ package depinject
import (
"reflect"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
type resolver interface {
diff --git a/depinject/simple.go b/depinject/simple.go
index 73c29e0bb7..9b8caff8c5 100644
--- a/depinject/simple.go
+++ b/depinject/simple.go
@@ -3,7 +3,7 @@ package depinject
import (
"reflect"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
type simpleProvider struct {
diff --git a/depinject/supply.go b/depinject/supply.go
index 0be0caef19..4e3a8bf9f9 100644
--- a/depinject/supply.go
+++ b/depinject/supply.go
@@ -3,7 +3,7 @@ package depinject
import (
"reflect"
- "github.com/cosmos/cosmos-sdk/depinject/internal/graphviz"
+ "cosmossdk.io/depinject/internal/graphviz"
)
type supplyResolver struct {
diff --git a/depinject/testdata/example.dot b/depinject/testdata/example.dot
index 317ecd78ff..ea61e3559e 100644
--- a/depinject/testdata/example.dot
+++ b/depinject/testdata/example.dot
@@ -1,43 +1,43 @@
digraph "" {
subgraph "cluster_a" {
graph [fontsize="12.0", label="Module: a", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5", shape="box"];
+ "cosmossdk.io/depinject_test.ModuleA.Provide"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5", shape="box"];
}
subgraph "cluster_b" {
graph [fontsize="12.0", label="Module: b", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
+ "cosmossdk.io/depinject_test.ModuleB.Provide"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
}
subgraph "cluster_runtime" {
graph [fontsize="12.0", label="Module: runtime", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
+ "cosmossdk.io/depinject_test.ProvideKVStoreKey"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
}
- "[]github.com/cosmos/cosmos-sdk/depinject_test.Command"[color="lightgrey", comment="many-per-container", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject.ModuleKey"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject.OwnModuleKey"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperA"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.MsgClientA"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideMsgClientA"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
- "github.com/cosmos/cosmos-sdk/depinject_test.TestGraphAndLogOutput"[color="black", fontcolor="black", penwidth="1.5", shape="hexagon"];
- "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler"[color="lightgrey", comment="one-per-module", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject.ModuleKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ProvideMsgClientA";
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideMsgClientA" -> "github.com/cosmos/cosmos-sdk/depinject_test.MsgClientA";
- "github.com/cosmos/cosmos-sdk/depinject.ModuleKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey";
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey";
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide";
- "github.com/cosmos/cosmos-sdk/depinject.OwnModuleKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "github.com/cosmos/cosmos-sdk/depinject_test.KeeperA";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "[]github.com/cosmos/cosmos-sdk/depinject_test.Command";
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.MsgClientA" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "[]github.com/cosmos/cosmos-sdk/depinject_test.Command";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler";
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB" -> "github.com/cosmos/cosmos-sdk/depinject_test.TestGraphAndLogOutput";
+ "[]cosmossdk.io/depinject_test.Command"[color="lightgrey", comment="many-per-container", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject.ModuleKey"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject.OwnModuleKey"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.KVStoreKey"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject_test.KeeperA"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.KeeperB"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject_test.MsgClientA"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject_test.ProvideMsgClientA"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
+ "cosmossdk.io/depinject_test.TestGraphAndLogOutput"[color="black", fontcolor="black", penwidth="1.5", shape="hexagon"];
+ "map[string]cosmossdk.io/depinject_test.Handler"[color="lightgrey", comment="one-per-module", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject.ModuleKey" -> "cosmossdk.io/depinject_test.ProvideMsgClientA";
+ "cosmossdk.io/depinject_test.ProvideMsgClientA" -> "cosmossdk.io/depinject_test.MsgClientA";
+ "cosmossdk.io/depinject.ModuleKey" -> "cosmossdk.io/depinject_test.ProvideKVStoreKey";
+ "cosmossdk.io/depinject_test.ProvideKVStoreKey" -> "cosmossdk.io/depinject_test.KVStoreKey";
+ "cosmossdk.io/depinject_test.KVStoreKey" -> "cosmossdk.io/depinject_test.ModuleA.Provide";
+ "cosmossdk.io/depinject.OwnModuleKey" -> "cosmossdk.io/depinject_test.ModuleA.Provide";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "cosmossdk.io/depinject_test.KeeperA";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "map[string]cosmossdk.io/depinject_test.Handler";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "[]cosmossdk.io/depinject_test.Command";
+ "cosmossdk.io/depinject_test.KVStoreKey" -> "cosmossdk.io/depinject_test.ModuleB.Provide";
+ "cosmossdk.io/depinject_test.MsgClientA" -> "cosmossdk.io/depinject_test.ModuleB.Provide";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "cosmossdk.io/depinject_test.KeeperB";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "[]cosmossdk.io/depinject_test.Command";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "map[string]cosmossdk.io/depinject_test.Handler";
+ "cosmossdk.io/depinject_test.KeeperB" -> "cosmossdk.io/depinject_test.TestGraphAndLogOutput";
}
diff --git a/depinject/testdata/example.svg b/depinject/testdata/example.svg
index a324b637cd..8000c3a65b 100644
--- a/depinject/testdata/example.svg
+++ b/depinject/testdata/example.svg
@@ -1,197 +1,191 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/depinject/testdata/example_error.dot b/depinject/testdata/example_error.dot
index 2d075537f5..a47386cdd4 100644
--- a/depinject/testdata/example_error.dot
+++ b/depinject/testdata/example_error.dot
@@ -1,40 +1,40 @@
digraph "" {
subgraph "cluster_a" {
graph [fontsize="12.0", label="Module: a", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5", shape="box"];
+ "cosmossdk.io/depinject_test.ModuleA.Provide"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5", shape="box"];
}
subgraph "cluster_b" {
graph [fontsize="12.0", label="Module: b", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide"[color="red", fontcolor="red", penwidth="0.5", shape="box"];
+ "cosmossdk.io/depinject_test.ModuleB.Provide"[color="red", fontcolor="red", penwidth="0.5", shape="box"];
}
subgraph "cluster_runtime" {
graph [fontsize="12.0", label="Module: runtime", penwidth="0.5", style="rounded"];
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
+ "cosmossdk.io/depinject_test.ProvideKVStoreKey"[color="black", fontcolor="black", penwidth="1.5", shape="box"];
}
- "[]github.com/cosmos/cosmos-sdk/depinject_test.Command"[color="lightgrey", comment="many-per-container", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject.ModuleKey"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject.OwnModuleKey"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey"[color="black", fontcolor="black", penwidth="1.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperA"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB"[color="red", fontcolor="red", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.MsgClientA"[color="red", fontcolor="red", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject_test.TestGraphAndLogOutput"[color="red", fontcolor="red", penwidth="0.5", shape="hexagon"];
- "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler"[color="lightgrey", comment="one-per-module", fontcolor="dimgrey", penwidth="0.5"];
- "github.com/cosmos/cosmos-sdk/depinject.ModuleKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey";
- "github.com/cosmos/cosmos-sdk/depinject_test.ProvideKVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey";
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide";
- "github.com/cosmos/cosmos-sdk/depinject.OwnModuleKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "github.com/cosmos/cosmos-sdk/depinject_test.KeeperA";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleA.Provide" -> "[]github.com/cosmos/cosmos-sdk/depinject_test.Command";
- "github.com/cosmos/cosmos-sdk/depinject_test.KVStoreKey" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.MsgClientA" -> "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "[]github.com/cosmos/cosmos-sdk/depinject_test.Command";
- "github.com/cosmos/cosmos-sdk/depinject_test.ModuleB.Provide" -> "map[string]github.com/cosmos/cosmos-sdk/depinject_test.Handler";
- "github.com/cosmos/cosmos-sdk/depinject_test.KeeperB" -> "github.com/cosmos/cosmos-sdk/depinject_test.TestGraphAndLogOutput";
+ "[]cosmossdk.io/depinject_test.Command"[color="lightgrey", comment="many-per-container", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject.ModuleKey"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject.OwnModuleKey"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.KVStoreKey"[color="black", fontcolor="black", penwidth="1.5"];
+ "cosmossdk.io/depinject_test.KeeperA"[color="lightgrey", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.KeeperB"[color="red", fontcolor="red", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.MsgClientA"[color="red", fontcolor="red", penwidth="0.5"];
+ "cosmossdk.io/depinject_test.TestGraphAndLogOutput"[color="red", fontcolor="red", penwidth="0.5", shape="hexagon"];
+ "map[string]cosmossdk.io/depinject_test.Handler"[color="lightgrey", comment="one-per-module", fontcolor="dimgrey", penwidth="0.5"];
+ "cosmossdk.io/depinject.ModuleKey" -> "cosmossdk.io/depinject_test.ProvideKVStoreKey";
+ "cosmossdk.io/depinject_test.ProvideKVStoreKey" -> "cosmossdk.io/depinject_test.KVStoreKey";
+ "cosmossdk.io/depinject_test.KVStoreKey" -> "cosmossdk.io/depinject_test.ModuleA.Provide";
+ "cosmossdk.io/depinject.OwnModuleKey" -> "cosmossdk.io/depinject_test.ModuleA.Provide";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "cosmossdk.io/depinject_test.KeeperA";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "map[string]cosmossdk.io/depinject_test.Handler";
+ "cosmossdk.io/depinject_test.ModuleA.Provide" -> "[]cosmossdk.io/depinject_test.Command";
+ "cosmossdk.io/depinject_test.KVStoreKey" -> "cosmossdk.io/depinject_test.ModuleB.Provide";
+ "cosmossdk.io/depinject_test.MsgClientA" -> "cosmossdk.io/depinject_test.ModuleB.Provide";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "cosmossdk.io/depinject_test.KeeperB";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "[]cosmossdk.io/depinject_test.Command";
+ "cosmossdk.io/depinject_test.ModuleB.Provide" -> "map[string]cosmossdk.io/depinject_test.Handler";
+ "cosmossdk.io/depinject_test.KeeperB" -> "cosmossdk.io/depinject_test.TestGraphAndLogOutput";
}
diff --git a/depinject/testdata/example_error.svg b/depinject/testdata/example_error.svg
index 6897a23dc9..d92675a8df 100644
--- a/depinject/testdata/example_error.svg
+++ b/depinject/testdata/example_error.svg
@@ -1,179 +1,173 @@
-
-
-
-
-
-
-
+
+
+
cluster_a
-
-Module: a
+
+Module: a
cluster_b
-
-Module: b
+
+Module: b
cluster_runtime
-
-Module: runtime
+
+Module: runtime
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide
-
-github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide
+cosmossdk.io/depinject_test.ModuleA.Provide
+
+cosmossdk.io/depinject_test.ModuleA.Provide
-
-
+
+
-[]github.com/cosmos/cosmos-sdk/container_test.Command
-
-[]github.com/cosmos/cosmos-sdk/container_test.Command
+[]cosmossdk.io/depinject_test.Command
+
+[]cosmossdk.io/depinject_test.Command
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide->[]github.com/cosmos/cosmos-sdk/container_test.Command
-
-
+cosmossdk.io/depinject_test.ModuleA.Provide->[]cosmossdk.io/depinject_test.Command
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.KeeperA
-
-github.com/cosmos/cosmos-sdk/container_test.KeeperA
+cosmossdk.io/depinject_test.KeeperA
+
+cosmossdk.io/depinject_test.KeeperA
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide->github.com/cosmos/cosmos-sdk/container_test.KeeperA
-
-
+cosmossdk.io/depinject_test.ModuleA.Provide->cosmossdk.io/depinject_test.KeeperA
+
+
-
+
-map[string]github.com/cosmos/cosmos-sdk/container_test.Handler
-
-map[string]github.com/cosmos/cosmos-sdk/container_test.Handler
+map[string]cosmossdk.io/depinject_test.Handler
+
+map[string]cosmossdk.io/depinject_test.Handler
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide->map[string]github.com/cosmos/cosmos-sdk/container_test.Handler
-
-
+cosmossdk.io/depinject_test.ModuleA.Provide->map[string]cosmossdk.io/depinject_test.Handler
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide
-
-github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide
+cosmossdk.io/depinject_test.ModuleB.Provide
+
+cosmossdk.io/depinject_test.ModuleB.Provide
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide->[]github.com/cosmos/cosmos-sdk/container_test.Command
-
-
+cosmossdk.io/depinject_test.ModuleB.Provide->[]cosmossdk.io/depinject_test.Command
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.KeeperB
-
-github.com/cosmos/cosmos-sdk/container_test.KeeperB
+cosmossdk.io/depinject_test.KeeperB
+
+cosmossdk.io/depinject_test.KeeperB
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide->github.com/cosmos/cosmos-sdk/container_test.KeeperB
-
-
+cosmossdk.io/depinject_test.ModuleB.Provide->cosmossdk.io/depinject_test.KeeperB
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide->map[string]github.com/cosmos/cosmos-sdk/container_test.Handler
-
-
+cosmossdk.io/depinject_test.ModuleB.Provide->map[string]cosmossdk.io/depinject_test.Handler
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.ProvideKVStoreKey
-
-github.com/cosmos/cosmos-sdk/container_test.ProvideKVStoreKey
+cosmossdk.io/depinject_test.ProvideKVStoreKey
+
+cosmossdk.io/depinject_test.ProvideKVStoreKey
-
+
-github.com/cosmos/cosmos-sdk/container_test.KVStoreKey
-
-github.com/cosmos/cosmos-sdk/container_test.KVStoreKey
+cosmossdk.io/depinject_test.KVStoreKey
+
+cosmossdk.io/depinject_test.KVStoreKey
-
+
-github.com/cosmos/cosmos-sdk/container_test.ProvideKVStoreKey->github.com/cosmos/cosmos-sdk/container_test.KVStoreKey
-
-
+cosmossdk.io/depinject_test.ProvideKVStoreKey->cosmossdk.io/depinject_test.KVStoreKey
+
+
-
+
-github.com/cosmos/cosmos-sdk/container.ModuleKey
-
-github.com/cosmos/cosmos-sdk/container.ModuleKey
+cosmossdk.io/depinject.ModuleKey
+
+cosmossdk.io/depinject.ModuleKey
-
+
-github.com/cosmos/cosmos-sdk/container.ModuleKey->github.com/cosmos/cosmos-sdk/container_test.ProvideKVStoreKey
-
-
+cosmossdk.io/depinject.ModuleKey->cosmossdk.io/depinject_test.ProvideKVStoreKey
+
+
-
+
-github.com/cosmos/cosmos-sdk/container.OwnModuleKey
-
-github.com/cosmos/cosmos-sdk/container.OwnModuleKey
+cosmossdk.io/depinject.OwnModuleKey
+
+cosmossdk.io/depinject.OwnModuleKey
-
+
-github.com/cosmos/cosmos-sdk/container.OwnModuleKey->github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide
-
-
+cosmossdk.io/depinject.OwnModuleKey->cosmossdk.io/depinject_test.ModuleA.Provide
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.KVStoreKey->github.com/cosmos/cosmos-sdk/container_test.ModuleA.Provide
-
-
+cosmossdk.io/depinject_test.KVStoreKey->cosmossdk.io/depinject_test.ModuleA.Provide
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.KVStoreKey->github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide
-
-
+cosmossdk.io/depinject_test.KVStoreKey->cosmossdk.io/depinject_test.ModuleB.Provide
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.TestGraphAndLogOutput
-
-github.com/cosmos/cosmos-sdk/container_test.TestGraphAndLogOutput
+cosmossdk.io/depinject_test.TestGraphAndLogOutput
+
+cosmossdk.io/depinject_test.TestGraphAndLogOutput
-
+
-github.com/cosmos/cosmos-sdk/container_test.KeeperB->github.com/cosmos/cosmos-sdk/container_test.TestGraphAndLogOutput
-
-
+cosmossdk.io/depinject_test.KeeperB->cosmossdk.io/depinject_test.TestGraphAndLogOutput
+
+
-
+
-github.com/cosmos/cosmos-sdk/container_test.MsgClientA
-
-github.com/cosmos/cosmos-sdk/container_test.MsgClientA
+cosmossdk.io/depinject_test.MsgClientA
+
+cosmossdk.io/depinject_test.MsgClientA
-
+
-github.com/cosmos/cosmos-sdk/container_test.MsgClientA->github.com/cosmos/cosmos-sdk/container_test.ModuleB.Provide
-
-
+cosmossdk.io/depinject_test.MsgClientA->cosmossdk.io/depinject_test.ModuleB.Provide
+
+
-
+
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 290280b3a8..a8030774b1 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
github.com/cosmos/btcutil v1.0.4
github.com/cosmos/cosmos-proto v1.0.0-alpha7
github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1
- github.com/cosmos/cosmos-sdk/depinject v1.0.0-alpha.4
+ cosmossdk.io/depinject v1.0.0-alpha.4
github.com/cosmos/cosmos-sdk/store/tools/ics23 v0.0.0-20220608170201-b0e82f964070
github.com/cosmos/go-bip39 v1.0.0
github.com/cosmos/iavl v0.18.0
@@ -280,7 +280,7 @@ replace (
cosmossdk.io/core => ./core
github.com/99designs/keyring => github.com/cosmos/keyring v1.1.7-0.20210622111912-ef00f8ac3d76
github.com/cosmos/cosmos-sdk/db => ./db
- github.com/cosmos/cosmos-sdk/depinject => ./depinject
+ cosmossdk.io/depinject => ./depinject
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
diff --git a/runtime/module.go b/runtime/module.go
index fe598f22ee..07ff9a430d 100644
--- a/runtime/module.go
+++ b/runtime/module.go
@@ -7,10 +7,10 @@ import (
runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
"cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/std"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/simapp/app.go b/simapp/app.go
index 5af2f8ad19..5c82472368 100644
--- a/simapp/app.go
+++ b/simapp/app.go
@@ -16,11 +16,11 @@ import (
tmos "github.com/tendermint/tendermint/libs/os"
dbm "github.com/tendermint/tm-db"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/server/api"
"github.com/cosmos/cosmos-sdk/server/config"
diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go
index fd6426c91d..e3a1cf694c 100644
--- a/simapp/test_helpers.go
+++ b/simapp/test_helpers.go
@@ -15,13 +15,13 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"
+ "cosmossdk.io/depinject"
"cosmossdk.io/math"
bam "github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/server"
"github.com/cosmos/cosmos-sdk/server/types"
"github.com/cosmos/cosmos-sdk/simapp/params"
diff --git a/testutil/network/network.go b/testutil/network/network.go
index 19f2b0fc66..dd37d270fa 100644
--- a/testutil/network/network.go
+++ b/testutil/network/network.go
@@ -26,6 +26,7 @@ import (
"cosmossdk.io/math"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
@@ -34,7 +35,6 @@ import (
"github.com/cosmos/cosmos-sdk/crypto/hd"
"github.com/cosmos/cosmos-sdk/crypto/keyring"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
- "github.com/cosmos/cosmos-sdk/depinject"
pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/server"
diff --git a/testutil/sims/app_helpers.go b/testutil/sims/app_helpers.go
index 8c6d29a043..03d6323ebf 100644
--- a/testutil/sims/app_helpers.go
+++ b/testutil/sims/app_helpers.go
@@ -13,12 +13,12 @@ import (
tmtypes "github.com/tendermint/tendermint/types"
dbm "github.com/tendermint/tm-db"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
"github.com/cosmos/cosmos-sdk/testutil/mock"
diff --git a/x/auth/client/cli/encode_test.go b/x/auth/client/cli/encode_test.go
index e74d92a35d..219491b2fc 100644
--- a/x/auth/client/cli/encode_test.go
+++ b/x/auth/client/cli/encode_test.go
@@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/client/cli"
diff --git a/x/auth/client/testutil/suite.go b/x/auth/client/testutil/suite.go
index 5bc6b735fc..2508744e2c 100644
--- a/x/auth/client/testutil/suite.go
+++ b/x/auth/client/testutil/suite.go
@@ -14,8 +14,8 @@ import (
"github.com/stretchr/testify/suite"
tmcli "github.com/tendermint/tendermint/libs/cli"
+ "cosmossdk.io/depinject"
"cosmossdk.io/math"
- "github.com/cosmos/cosmos-sdk/depinject"
authtestutil "github.com/cosmos/cosmos-sdk/x/auth/testutil"
"github.com/cosmos/cosmos-sdk/client"
diff --git a/x/auth/client/tx_test.go b/x/auth/client/tx_test.go
index 13de490c67..9be7a90156 100644
--- a/x/auth/client/tx_test.go
+++ b/x/auth/client/tx_test.go
@@ -7,12 +7,12 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/auth/module.go b/x/auth/module.go
index e516464f20..8b1885aa67 100644
--- a/x/auth/module.go
+++ b/x/auth/module.go
@@ -6,7 +6,7 @@ import (
"fmt"
"math/rand"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
diff --git a/x/auth/simulation/decoder_test.go b/x/auth/simulation/decoder_test.go
index 3dfb6576c8..efc7dcc461 100644
--- a/x/auth/simulation/decoder_test.go
+++ b/x/auth/simulation/decoder_test.go
@@ -7,9 +7,9 @@ import (
gogotypes "github.com/gogo/protobuf/types"
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/auth/simulation"
diff --git a/x/auth/tx/aux_test.go b/x/auth/tx/aux_test.go
index 2f86c9ec71..023b7b477a 100644
--- a/x/auth/tx/aux_test.go
+++ b/x/auth/tx/aux_test.go
@@ -5,11 +5,11 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
clienttx "github.com/cosmos/cosmos-sdk/client/tx"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
txtypes "github.com/cosmos/cosmos-sdk/types/tx"
diff --git a/x/auth/tx/module/module.go b/x/auth/tx/module/module.go
index a4850bfc9a..b005d6cadc 100644
--- a/x/auth/tx/module/module.go
+++ b/x/auth/tx/module/module.go
@@ -5,10 +5,10 @@ import (
modulev1 "cosmossdk.io/api/cosmos/tx/module/v1"
"cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth/ante"
diff --git a/x/auth/types/account_test.go b/x/auth/types/account_test.go
index 5289f4aeeb..20a045bbb8 100644
--- a/x/auth/types/account_test.go
+++ b/x/auth/types/account_test.go
@@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/require"
"sigs.k8s.io/yaml"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
sdk "github.com/cosmos/cosmos-sdk/types"
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
diff --git a/x/auth/types/genesis_test.go b/x/auth/types/genesis_test.go
index b6f0bce62e..afa41b2759 100644
--- a/x/auth/types/genesis_test.go
+++ b/x/auth/types/genesis_test.go
@@ -4,8 +4,8 @@ import (
"encoding/json"
"testing"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
proto "github.com/gogo/protobuf/proto"
"github.com/stretchr/testify/require"
diff --git a/x/auth/vesting/module.go b/x/auth/vesting/module.go
index fe70dfdd11..4484e0a34b 100644
--- a/x/auth/vesting/module.go
+++ b/x/auth/vesting/module.go
@@ -7,10 +7,10 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/x/authz/migrations/v046/store_test.go b/x/authz/migrations/v046/store_test.go
index 922b21b30b..0cefd65cf7 100644
--- a/x/authz/migrations/v046/store_test.go
+++ b/x/authz/migrations/v046/store_test.go
@@ -4,10 +4,10 @@ import (
"testing"
"time"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/authz"
diff --git a/x/authz/module/module.go b/x/authz/module/module.go
index 0ee9a8a2dd..6f1e2431bd 100644
--- a/x/authz/module/module.go
+++ b/x/authz/module/module.go
@@ -12,11 +12,11 @@ import (
modulev1 "cosmossdk.io/api/cosmos/authz/module/v1"
"cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/authz/simulation/decoder_test.go b/x/authz/simulation/decoder_test.go
index e212a860a1..a5737ace5e 100644
--- a/x/authz/simulation/decoder_test.go
+++ b/x/authz/simulation/decoder_test.go
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/authz"
diff --git a/x/authz/simulation/genesis_test.go b/x/authz/simulation/genesis_test.go
index 2721861972..a6ad0e3995 100644
--- a/x/authz/simulation/genesis_test.go
+++ b/x/authz/simulation/genesis_test.go
@@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
sdkmath "cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/authz"
diff --git a/x/bank/module.go b/x/bank/module.go
index afc1f0003c..4a31f85cc9 100644
--- a/x/bank/module.go
+++ b/x/bank/module.go
@@ -8,7 +8,7 @@ import (
"time"
modulev1 "cosmossdk.io/api/cosmos/bank/module/v1"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
store "github.com/cosmos/cosmos-sdk/store/types"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/tendermint/tendermint/crypto"
diff --git a/x/capability/module.go b/x/capability/module.go
index 3f994cb26b..a4c3f5e818 100644
--- a/x/capability/module.go
+++ b/x/capability/module.go
@@ -13,10 +13,10 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
modulev1 "cosmossdk.io/api/cosmos/capability/module/v1"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/cosmos/cosmos-sdk/telemetry"
diff --git a/x/capability/simulation/decoder_test.go b/x/capability/simulation/decoder_test.go
index 484985bbbc..1c3c7e6d0d 100644
--- a/x/capability/simulation/decoder_test.go
+++ b/x/capability/simulation/decoder_test.go
@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/capability/simulation"
diff --git a/x/crisis/module.go b/x/crisis/module.go
index 8afbf8d89c..4b114baeb5 100644
--- a/x/crisis/module.go
+++ b/x/crisis/module.go
@@ -12,10 +12,10 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
modulev1 "cosmossdk.io/api/cosmos/crisis/module/v1"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/server"
servertypes "github.com/cosmos/cosmos-sdk/server/types"
diff --git a/x/distribution/module.go b/x/distribution/module.go
index be9b7f5e08..7366ce1d1a 100644
--- a/x/distribution/module.go
+++ b/x/distribution/module.go
@@ -6,16 +6,16 @@ import (
"fmt"
"math/rand"
- modulev1 "cosmossdk.io/api/cosmos/distribution/module/v1"
- "cosmossdk.io/core/appmodule"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ modulev1 "cosmossdk.io/api/cosmos/distribution/module/v1"
+ "cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/distribution/simulation/decoder_test.go b/x/distribution/simulation/decoder_test.go
index 37151379b5..4c00446108 100644
--- a/x/distribution/simulation/decoder_test.go
+++ b/x/distribution/simulation/decoder_test.go
@@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/distribution/simulation"
diff --git a/x/evidence/keeper/querier_test.go b/x/evidence/keeper/querier_test.go
index 45989b05f1..e15412ba2b 100644
--- a/x/evidence/keeper/querier_test.go
+++ b/x/evidence/keeper/querier_test.go
@@ -3,8 +3,8 @@ package keeper_test
import (
"strings"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/stretchr/testify/require"
"github.com/cosmos/cosmos-sdk/x/evidence/exported"
diff --git a/x/evidence/module.go b/x/evidence/module.go
index 3e9bc7641a..1b9759c34a 100644
--- a/x/evidence/module.go
+++ b/x/evidence/module.go
@@ -11,10 +11,10 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/evidence/simulation/decoder_test.go b/x/evidence/simulation/decoder_test.go
index 2fa58f43fd..fdba04c41c 100644
--- a/x/evidence/simulation/decoder_test.go
+++ b/x/evidence/simulation/decoder_test.go
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/evidence/keeper"
diff --git a/x/feegrant/filtered_fee_test.go b/x/feegrant/filtered_fee_test.go
index acda5c98c2..4bda42a5b2 100644
--- a/x/feegrant/filtered_fee_test.go
+++ b/x/feegrant/filtered_fee_test.go
@@ -8,9 +8,9 @@ import (
"github.com/stretchr/testify/require"
ocproto "github.com/tendermint/tendermint/proto/tendermint/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
diff --git a/x/feegrant/migrations/v046/store_test.go b/x/feegrant/migrations/v046/store_test.go
index 6d6f8828b8..eadf8c33ca 100644
--- a/x/feegrant/migrations/v046/store_test.go
+++ b/x/feegrant/migrations/v046/store_test.go
@@ -4,9 +4,9 @@ import (
"testing"
"time"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/feegrant"
diff --git a/x/feegrant/module/module.go b/x/feegrant/module/module.go
index d0fd9c0aef..77aa839f49 100644
--- a/x/feegrant/module/module.go
+++ b/x/feegrant/module/module.go
@@ -12,10 +12,10 @@ import (
modulev1 "cosmossdk.io/api/cosmos/feegrant/module/v1"
+ "cosmossdk.io/depinject"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/feegrant/simulation/decoder_test.go b/x/feegrant/simulation/decoder_test.go
index 0a6372403c..4652dd1146 100644
--- a/x/feegrant/simulation/decoder_test.go
+++ b/x/feegrant/simulation/decoder_test.go
@@ -6,9 +6,9 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/feegrant"
diff --git a/x/genutil/module.go b/x/genutil/module.go
index edce18408e..0bf86f85d4 100644
--- a/x/genutil/module.go
+++ b/x/genutil/module.go
@@ -10,10 +10,10 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/x/gov/module.go b/x/gov/module.go
index 2147096a39..ad54cdd9f6 100644
--- a/x/gov/module.go
+++ b/x/gov/module.go
@@ -9,19 +9,19 @@ import (
"math/rand"
"sort"
- modulev1 "cosmossdk.io/api/cosmos/gov/module/v1"
- "cosmossdk.io/core/appmodule"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
"golang.org/x/exp/maps"
"golang.org/x/exp/slices"
+ modulev1 "cosmossdk.io/api/cosmos/gov/module/v1"
+ "cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/group/module/module.go b/x/group/module/module.go
index 4f23422042..3adaff5d01 100644
--- a/x/group/module/module.go
+++ b/x/group/module/module.go
@@ -12,11 +12,11 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
modulev1 "cosmossdk.io/api/cosmos/group/module/v1"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/group/proposal_test.go b/x/group/proposal_test.go
index 2ad781f7a3..8e741908db 100644
--- a/x/group/proposal_test.go
+++ b/x/group/proposal_test.go
@@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/x/group"
"github.com/cosmos/cosmos-sdk/x/group/testutil"
)
diff --git a/x/group/simulation/decoder_test.go b/x/group/simulation/decoder_test.go
index b5de0c3f43..74106303f6 100644
--- a/x/group/simulation/decoder_test.go
+++ b/x/group/simulation/decoder_test.go
@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/testutil/testdata"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/group"
diff --git a/x/group/simulation/genesis_test.go b/x/group/simulation/genesis_test.go
index d05e524952..db09434920 100644
--- a/x/group/simulation/genesis_test.go
+++ b/x/group/simulation/genesis_test.go
@@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
sdkmath "cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/group"
diff --git a/x/mint/module.go b/x/mint/module.go
index c4df3df779..7945b4abee 100644
--- a/x/mint/module.go
+++ b/x/mint/module.go
@@ -12,10 +12,10 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/nft/module/module.go b/x/nft/module/module.go
index 2532b8fab7..51f08ff123 100644
--- a/x/nft/module/module.go
+++ b/x/nft/module/module.go
@@ -10,10 +10,10 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
"cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/params/keeper/common_test.go b/x/params/keeper/common_test.go
index dfd0aa34e7..27b6295a65 100644
--- a/x/params/keeper/common_test.go
+++ b/x/params/keeper/common_test.go
@@ -1,8 +1,8 @@
package keeper_test
import (
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdktestutil "github.com/cosmos/cosmos-sdk/testutil"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/params/module.go b/x/params/module.go
index ef64bcbf93..535920c6a2 100644
--- a/x/params/module.go
+++ b/x/params/module.go
@@ -3,16 +3,17 @@ package params
import (
"context"
"encoding/json"
- govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
"math/rand"
+ govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
+
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
modulev1 "cosmossdk.io/api/cosmos/params/module/v1"
"cosmossdk.io/core/appmodule"
- "github.com/cosmos/cosmos-sdk/depinject"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/baseapp"
diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go
index 4a967c42b2..63874489dc 100644
--- a/x/params/types/subspace_test.go
+++ b/x/params/types/subspace_test.go
@@ -11,8 +11,8 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
dbm "github.com/tendermint/tm-db"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/store"
storetypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/slashing/module.go b/x/slashing/module.go
index a06c434b49..a9d30d85af 100644
--- a/x/slashing/module.go
+++ b/x/slashing/module.go
@@ -14,10 +14,10 @@ import (
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
diff --git a/x/slashing/simulation/decoder_test.go b/x/slashing/simulation/decoder_test.go
index 15e6acf33c..52fe08083a 100644
--- a/x/slashing/simulation/decoder_test.go
+++ b/x/slashing/simulation/decoder_test.go
@@ -8,9 +8,9 @@ import (
gogotypes "github.com/gogo/protobuf/types"
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/kv"
"github.com/cosmos/cosmos-sdk/x/slashing/simulation"
diff --git a/x/slashing/simulation/genesis_test.go b/x/slashing/simulation/genesis_test.go
index 99c9e010dd..6cf18bb751 100644
--- a/x/slashing/simulation/genesis_test.go
+++ b/x/slashing/simulation/genesis_test.go
@@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/require"
+ "cosmossdk.io/depinject"
sdkmath "cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
diff --git a/x/staking/module.go b/x/staking/module.go
index 944d7d4842..f748d2e5a2 100644
--- a/x/staking/module.go
+++ b/x/staking/module.go
@@ -7,17 +7,17 @@ import (
"math/rand"
"sort"
- modulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
- "cosmossdk.io/core/appmodule"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/spf13/cobra"
abci "github.com/tendermint/tendermint/abci/types"
"golang.org/x/exp/maps"
+ modulev1 "cosmossdk.io/api/cosmos/staking/module/v1"
+ "cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
store "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/upgrade/abci_test.go b/x/upgrade/abci_test.go
index 878f1f0ab0..b76185452b 100644
--- a/x/upgrade/abci_test.go
+++ b/x/upgrade/abci_test.go
@@ -12,9 +12,9 @@ import (
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
"golang.org/x/exp/maps"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/server"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go
index c9e2b05360..d2e8274f6c 100644
--- a/x/upgrade/keeper/keeper_test.go
+++ b/x/upgrade/keeper/keeper_test.go
@@ -8,8 +8,8 @@ import (
"github.com/stretchr/testify/suite"
tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/baseapp"
- "github.com/cosmos/cosmos-sdk/depinject"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
diff --git a/x/upgrade/module.go b/x/upgrade/module.go
index 74df9aafa7..6589b63343 100644
--- a/x/upgrade/module.go
+++ b/x/upgrade/module.go
@@ -3,6 +3,7 @@ package upgrade
import (
"context"
"encoding/json"
+
govv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1"
gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime"
@@ -11,11 +12,11 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
"cosmossdk.io/core/appmodule"
+ "cosmossdk.io/depinject"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
- "github.com/cosmos/cosmos-sdk/depinject"
"github.com/cosmos/cosmos-sdk/runtime"
"github.com/cosmos/cosmos-sdk/server"
servertypes "github.com/cosmos/cosmos-sdk/server/types"