From 68a457f6830f8b1dfa2becd48a4b5e7d6f66043d Mon Sep 17 00:00:00 2001 From: Julien Robert Date: Wed, 14 Jun 2023 22:40:06 +0200 Subject: [PATCH] chore(simapp): always use latest extracted sdk modules on main (#16544) --- simapp/go.mod | 12 ++++++++++++ simapp/go.sum | 16 ---------------- tests/go.mod | 12 ++++++++++++ tests/go.sum | 12 ------------ 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/simapp/go.mod b/simapp/go.mod index be2513e339..b606c61c5d 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -199,6 +199,18 @@ require ( // // ) +// SimApp on main always tests the latest extracted SDK modules importing the sdk +replace ( + cosmossdk.io/client/v2 => ../client/v2 + cosmossdk.io/tools/confix => ../tools/confix + cosmossdk.io/tools/rosetta => ../tools/rosetta + cosmossdk.io/x/circuit => ../x/circuit + cosmossdk.io/x/evidence => ../x/evidence + cosmossdk.io/x/feegrant => ../x/feegrant + cosmossdk.io/x/nft => ../x/nft + cosmossdk.io/x/upgrade => ../x/upgrade +) + // Below are the long-lived replace of the SimApp replace ( // use cosmos fork of keyring diff --git a/simapp/go.sum b/simapp/go.sum index cc9f883fc8..a48edbb252 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -190,8 +190,6 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.4.2 h1:lQBMl4xINnMnBOR/tQLtjlDnR4exr4e6/SfHR8PILE0= cosmossdk.io/api v0.4.2/go.mod h1:qrVgOp7DIeAXa+Tt5dDjOC47bZCDrwx8ZHxrmy7STNE= -cosmossdk.io/client/v2 v2.0.0-20230614103911-b3da8bb4e801 h1:h8GsPQ6/VAJ9B4joCTGBe3LvSPEzGTtFonrG4ltsowQ= -cosmossdk.io/client/v2 v2.0.0-20230614103911-b3da8bb4e801/go.mod h1:55KO/mJnklKWaDVQn5Q126IsbenPosRBUFRDpr5TQr8= cosmossdk.io/collections v0.2.0 h1:CgMfLtE16+qox3zBYrGh60i4yKV8SeExLnIdOS2sbQs= cosmossdk.io/collections v0.2.0/go.mod h1:Oc1FK0vlmxJZsgUn9/o3ldE6zNyWKvobVzaLhWknZJE= cosmossdk.io/core v0.8.0 h1:LcJnu52E1a8f8E317VfQ1xK/RZe+IuhMNQAjnDLh25M= @@ -206,22 +204,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c h1:A+FMPW9GtfcPBDQNtFeDFN27h1SAP6OVjnGgPLlYXmI= cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c/go.mod h1:RbYGvXCbz8uNBCXrwS9Z8SyydeWi+W5x5MZ33muyzMw= -cosmossdk.io/tools/confix v0.0.0-20230613133644-0a778132a60f h1:G9ndAIFl35a7pz197rGu8CfZLlKmTpn4zQ/jzb2tdUg= -cosmossdk.io/tools/confix v0.0.0-20230613133644-0a778132a60f/go.mod h1:xd13uWr9L1xgATVLYwW2xaB9M6Kdv1AEhHY7CMIvdMo= -cosmossdk.io/tools/rosetta v0.2.1-0.20230613133644-0a778132a60f h1:p/pez1Q7Xwh9AiHWMA0uHxsB+XpReABHr6xCyMWdDAg= -cosmossdk.io/tools/rosetta v0.2.1-0.20230613133644-0a778132a60f/go.mod h1:kzkqn95F9UonJTmjS+aydreXxsWiaGKe/b4HxHZvwHM= -cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f h1:BvQbpIEEjs834dsiYjh3Fj4mI7YlmuENr+vEQ4GkAfY= -cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f/go.mod h1:Sq3qUTEOHZqIRJuzcOQzRPJdZ/nl7ZesL4oD0WZddTM= -cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f h1:GCFNCVOWnzd5VzdSoFiVRl8rhgwjYXkh4s2bSQ2d5bc= -cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f/go.mod h1:GUv9h9FbZuMrP+LSIsmhZDlWWuIpDRu4oY2cS1aztFE= -cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f h1:U7+CQe8O9rzinYH0tYwWBGo139QH/FIgHllKfpk08Ic= -cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f/go.mod h1:8EO/IBZa8CwNTlpYjKpB1N+4OOUKZoCRUjJSIkvJCVI= -cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f h1:DhoGGOkUtvHHI8SawGi0jp9mTK/fcBgi/K2Mseqtphk= -cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f/go.mod h1:/e677KQ7zrQwg5AAzM4q0F4inF6l+8MP5VsVRZsM5rc= cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU= cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA= -cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f h1:/YGzDcBc9kjcjHWbeDVQTplrVh2+2ka93aYyuo99EDI= -cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f/go.mod h1:O4CuNLGYanpaqXG8ppGdGfQ36/w5BP0N2iIyAgCKKEc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= diff --git a/tests/go.mod b/tests/go.mod index cb524ab9c7..b29868c8c9 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -194,6 +194,18 @@ require ( // // ) +// SimApp on main always tests the latest extracted SDK modules importing the sdk +replace ( + cosmossdk.io/client/v2 => ../client/v2 + cosmossdk.io/tools/confix => ../tools/confix + cosmossdk.io/tools/rosetta => ../tools/rosetta + cosmossdk.io/x/circuit => ../x/circuit + cosmossdk.io/x/evidence => ../x/evidence + cosmossdk.io/x/feegrant => ../x/feegrant + cosmossdk.io/x/nft => ../x/nft + cosmossdk.io/x/upgrade => ../x/upgrade +) + // Below are the long-lived replace for tests. replace ( // We always want to test against the latest version of the simapp. diff --git a/tests/go.sum b/tests/go.sum index 4ec214bbc1..2a0850da6c 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -190,8 +190,6 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.4.2 h1:lQBMl4xINnMnBOR/tQLtjlDnR4exr4e6/SfHR8PILE0= cosmossdk.io/api v0.4.2/go.mod h1:qrVgOp7DIeAXa+Tt5dDjOC47bZCDrwx8ZHxrmy7STNE= -cosmossdk.io/client/v2 v2.0.0-20230614103911-b3da8bb4e801 h1:h8GsPQ6/VAJ9B4joCTGBe3LvSPEzGTtFonrG4ltsowQ= -cosmossdk.io/client/v2 v2.0.0-20230614103911-b3da8bb4e801/go.mod h1:55KO/mJnklKWaDVQn5Q126IsbenPosRBUFRDpr5TQr8= cosmossdk.io/collections v0.2.0 h1:CgMfLtE16+qox3zBYrGh60i4yKV8SeExLnIdOS2sbQs= cosmossdk.io/collections v0.2.0/go.mod h1:Oc1FK0vlmxJZsgUn9/o3ldE6zNyWKvobVzaLhWknZJE= cosmossdk.io/core v0.8.0 h1:LcJnu52E1a8f8E317VfQ1xK/RZe+IuhMNQAjnDLh25M= @@ -206,18 +204,8 @@ cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c h1:A+FMPW9GtfcPBDQNtFeDFN27h1SAP6OVjnGgPLlYXmI= cosmossdk.io/store v0.1.0-alpha.1.0.20230606190835-3e18f4088b2c/go.mod h1:RbYGvXCbz8uNBCXrwS9Z8SyydeWi+W5x5MZ33muyzMw= -cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f h1:BvQbpIEEjs834dsiYjh3Fj4mI7YlmuENr+vEQ4GkAfY= -cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f/go.mod h1:Sq3qUTEOHZqIRJuzcOQzRPJdZ/nl7ZesL4oD0WZddTM= -cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f h1:GCFNCVOWnzd5VzdSoFiVRl8rhgwjYXkh4s2bSQ2d5bc= -cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f/go.mod h1:GUv9h9FbZuMrP+LSIsmhZDlWWuIpDRu4oY2cS1aztFE= -cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f h1:U7+CQe8O9rzinYH0tYwWBGo139QH/FIgHllKfpk08Ic= -cosmossdk.io/x/feegrant v0.0.0-20230613133644-0a778132a60f/go.mod h1:8EO/IBZa8CwNTlpYjKpB1N+4OOUKZoCRUjJSIkvJCVI= -cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f h1:DhoGGOkUtvHHI8SawGi0jp9mTK/fcBgi/K2Mseqtphk= -cosmossdk.io/x/nft v0.0.0-20230613133644-0a778132a60f/go.mod h1:/e677KQ7zrQwg5AAzM4q0F4inF6l+8MP5VsVRZsM5rc= cosmossdk.io/x/tx v0.8.0 h1:gLiGRL/Fy7fs6dd0IX8jOf0PrVr56/SG6XVMGQjyvJU= cosmossdk.io/x/tx v0.8.0/go.mod h1:T9uEumGNgKU61gJYRv1t3uzQwLnASpJGmSE229HM3xA= -cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f h1:/YGzDcBc9kjcjHWbeDVQTplrVh2+2ka93aYyuo99EDI= -cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f/go.mod h1:O4CuNLGYanpaqXG8ppGdGfQ36/w5BP0N2iIyAgCKKEc= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=