From 00b21a08141a9be1e288c0a7a5903b8d01c01d21 Mon Sep 17 00:00:00 2001 From: likhita-809 Date: Fri, 8 Sep 2023 10:49:27 +0530 Subject: [PATCH] fix tests --- go.mod | 2 -- simapp/app_v2.go | 4 ++++ simapp/gomod2nix.toml | 3 --- tests/go.mod | 3 ++- tests/go.sum | 2 -- tests/starship/tests/go.mod | 2 +- x/circuit/go.mod | 2 +- x/evidence/go.mod | 2 +- x/feegrant/go.mod | 2 +- x/nft/go.mod | 2 +- x/pool/go.mod | 4 +++- x/pool/go.sum | 2 -- x/pool/module.go | 2 +- x/upgrade/go.mod | 2 +- 14 files changed, 16 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index 49597c59e381..2dfa6192e757 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,5 @@ go 1.21 -toolchain go1.21.0 - module github.com/cosmos/cosmos-sdk require ( diff --git a/simapp/app_v2.go b/simapp/app_v2.go index 50bb5cb3687d..1887638ab7a9 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -16,6 +16,8 @@ import ( evidencekeeper "cosmossdk.io/x/evidence/keeper" feegrantkeeper "cosmossdk.io/x/feegrant/keeper" nftkeeper "cosmossdk.io/x/nft/keeper" + _ "cosmossdk.io/x/pool" + poolkeeper "cosmossdk.io/x/pool/keeper" upgradekeeper "cosmossdk.io/x/upgrade/keeper" "github.com/cosmos/cosmos-sdk/baseapp" @@ -83,6 +85,7 @@ type SimApp struct { NFTKeeper nftkeeper.Keeper ConsensusParamsKeeper consensuskeeper.Keeper CircuitBreakerKeeper circuitkeeper.Keeper + PoolKeeper poolkeeper.Keeper // simulation manager sm *module.SimulationManager @@ -185,6 +188,7 @@ func NewSimApp( &app.NFTKeeper, &app.ConsensusParamsKeeper, &app.CircuitBreakerKeeper, + &app.PoolKeeper, ); err != nil { panic(err) } diff --git a/simapp/gomod2nix.toml b/simapp/gomod2nix.toml index 81228f5d4b02..4ceff3a6f8f3 100644 --- a/simapp/gomod2nix.toml +++ b/simapp/gomod2nix.toml @@ -16,9 +16,6 @@ schema = 3 [mod."cloud.google.com/go/storage"] version = "v1.31.0" hash = "sha256-d59Q6JjMga6/7d1TtFW9GuAq+6O2U4LhNesz3Knmo0E=" - [mod."cosmossdk.io/api"] - version = "v0.7.0" - hash = "sha256-PuYJB6k6Vv9nMmaY7pfCnSJTmcARssZvA5oz1Yq4YF4=" [mod."cosmossdk.io/collections"] version = "v0.4.0" hash = "sha256-minFyzgO/D+Oda4E3B1qvOAN5qd65SjS6nmjca4cp/8=" diff --git a/tests/go.mod b/tests/go.mod index efa079b84159..612d4367428f 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos/cosmos-sdk/tests -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 @@ -197,6 +197,7 @@ require ( // SimApp on main always tests the latest extracted SDK modules importing the sdk replace ( + cosmossdk.io/api => ../api cosmossdk.io/client/v2 => ../client/v2 cosmossdk.io/x/circuit => ../x/circuit cosmossdk.io/x/evidence => ../x/evidence diff --git a/tests/go.sum b/tests/go.sum index e8a7cf03db10..38a24d7cc40f 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -187,8 +187,6 @@ cloud.google.com/go/webrisk v1.4.0/go.mod h1:Hn8X6Zr+ziE2aNd8SliSDWpEnSS1u4R9+xX cloud.google.com/go/webrisk v1.5.0/go.mod h1:iPG6fr52Tv7sGk0H6qUFzmL3HHZev1htXuWDEEsqMTg= cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1Vwf+KmJENM0= cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= -cosmossdk.io/api v0.7.0 h1:QsEMIWuv9xWDbF2HZnW4Lpu1/SejCztPu0LQx7t6MN4= -cosmossdk.io/api v0.7.0/go.mod h1:kJFAEMLN57y0viszHDPLMmieF0471o5QAwwApa+270M= cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= cosmossdk.io/core v0.10.0 h1:NP28Ol9YyRODmZLJg2ko/mUl40hMegeMzhJnG+XPkcY= diff --git a/tests/starship/tests/go.mod b/tests/starship/tests/go.mod index 0028a4ef78bd..ee0db67f4288 100644 --- a/tests/starship/tests/go.mod +++ b/tests/starship/tests/go.mod @@ -1,6 +1,6 @@ module github.com/cosmos-sdk/tests/starship/tests -go 1.21.0 +go 1.21 replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 diff --git a/x/circuit/go.mod b/x/circuit/go.mod index f9a6a33cffaa..a858c87e7aa8 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/circuit -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 diff --git a/x/evidence/go.mod b/x/evidence/go.mod index 9f7ecb63639f..46644ed8a1cb 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/evidence -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index f6fed47aff2d..3c3955b6837c 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/feegrant -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 diff --git a/x/nft/go.mod b/x/nft/go.mod index d1ff8dbe8ab4..4a55d2729d98 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/nft -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 diff --git a/x/pool/go.mod b/x/pool/go.mod index 063f014ecfcb..3eec7f577e42 100644 --- a/x/pool/go.mod +++ b/x/pool/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/pool -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0 @@ -148,3 +148,5 @@ require ( ) replace github.com/cosmos/cosmos-sdk => ../../. + +replace cosmossdk.io/api => ../../api diff --git a/x/pool/go.sum b/x/pool/go.sum index e321f0accec4..e4d370bf0ea8 100644 --- a/x/pool/go.sum +++ b/x/pool/go.sum @@ -35,8 +35,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -cosmossdk.io/api v0.7.0 h1:QsEMIWuv9xWDbF2HZnW4Lpu1/SejCztPu0LQx7t6MN4= -cosmossdk.io/api v0.7.0/go.mod h1:kJFAEMLN57y0viszHDPLMmieF0471o5QAwwApa+270M= cosmossdk.io/collections v0.4.0 h1:PFmwj2W8szgpD5nOd8GWH6AbYNi1f2J6akWXJ7P5t9s= cosmossdk.io/collections v0.4.0/go.mod h1:oa5lUING2dP+gdDquow+QjlF45eL1t4TJDypgGd+tv0= cosmossdk.io/core v0.10.0 h1:NP28Ol9YyRODmZLJg2ko/mUl40hMegeMzhJnG+XPkcY= diff --git a/x/pool/module.go b/x/pool/module.go index 5a3764daa650..27ad502a5315 100644 --- a/x/pool/module.go +++ b/x/pool/module.go @@ -5,7 +5,7 @@ import ( gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" - modulev1 "cosmossdk.io/api/cosmos/consensus/module/v1" + modulev1 "cosmossdk.io/api/cosmos/pool/module/v1" "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" storetypes "cosmossdk.io/core/store" diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index f63505db464f..f4ed21d2e7b5 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -1,6 +1,6 @@ module cosmossdk.io/x/upgrade -go 1.21.0 +go 1.21 require ( cosmossdk.io/api v0.7.0