From 2653bc7e93a7c120aebc0d296720cf0cfb166c36 Mon Sep 17 00:00:00 2001 From: Philip Offtermatt Date: Fri, 1 Dec 2023 16:21:32 +0100 Subject: [PATCH] Start fixing merge conflicts --- Dockerfile-test | 26 -------------------------- Dockerfile.test | 2 +- cometmock/abci_client/client.go | 2 +- 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 Dockerfile-test diff --git a/Dockerfile-test b/Dockerfile-test deleted file mode 100644 index ade20b1..0000000 --- a/Dockerfile-test +++ /dev/null @@ -1,26 +0,0 @@ -# import simd from cosmos-sd -FROM --platform=linux/x86_64/v8 interchainio/simapp:v0.45.16 AS simapp-builder - -FROM golang:1.20-alpine as cometmock-builder - -ENV PACKAGES curl make git libc-dev bash gcc linux-headers -RUN apk add --no-cache $PACKAGES - -ENV CGO_ENABLED=0 -ENV GOOS=linux -ENV GOFLAGS="-buildvcs=false" - -# cache gomodules for cometmock -ADD ./go.mod /go.mod -ADD ./go.sum /go.sum -RUN go mod download - -# Add CometMock and install it -ADD . /CometMock -WORKDIR /CometMock -RUN go build -o /usr/local/bin/cometmock ./cometmock - -RUN apk update -RUN apk add --no-cache which iputils procps-ng tmux net-tools htop jq gcompat - -COPY --from=simapp-builder /usr/bin/simd /usr/local/bin/simd \ No newline at end of file diff --git a/Dockerfile.test b/Dockerfile.test index cc2c773..7d2ae62 100644 --- 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 index b7d1818..93cebaa 100644 --- 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 {