Start fixing merge conflicts

informalsystems · Dec 1, 2023 · 2653bc7 · 2653bc7
1 parent 9b07f80
commit 2653bc7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 28 deletions.
diff --git a/Dockerfile-test b/Dockerfile-test
diff --git a/Dockerfile.test b/Dockerfile.test
@@ -1,5 +1,5 @@
 # import simd from ibc-go
-FROM ghcr.io/cosmos/simapp:v0.47 AS simapp-builder
+FROM --platform=linux/x86_64/v8 interchainio/simapp:v0.45.16 AS simapp-builder
 
 FROM golang:1.20-alpine as cometmock-builder
 

diff --git a/cometmock/abci_client/client.go b/cometmock/abci_client/client.go
@@ -1117,7 +1117,7 @@ func UpdateState(
 // adapted from https://github.com/cometbft/cometbft/blob/9267594e0a17c01cc4a97b399ada5eaa8a734db5/state/execution.go#L452
 func validateValidatorUpdates(
 	abciUpdates []abcitypes.ValidatorUpdate,
-	params cmttypes.ValidatorParams,
+	params cmtproto.ValidatorParams,
 ) error {
 	for _, valUpdate := range abciUpdates {
 		if valUpdate.GetPower() < 0 {