diff --git a/Dockerfile b/Dockerfile index 2df93651..34202339 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21-alpine AS go-builder +FROM golang:1.21-alpine3.18 AS go-builder RUN apk add --no-cache ca-certificates build-base git @@ -26,7 +26,7 @@ RUN cd demo/ && LEDGER_ENABLED=false BUILD_TAGS=muslc LINK_STATICALLY=true make && (file /code/demo/build/meshd | grep "statically linked") # -------------------------------------------------------- -FROM alpine:3.16 +FROM alpine:3.18 COPY --from=go-builder /code/demo/build/meshd /usr/bin/meshd diff --git a/demo/Makefile b/demo/Makefile index aece59aa..082596a4 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -78,7 +78,7 @@ ifeq ($(OS),Windows_NT) $(error mesh demo server not supported) exit 1 else - go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/$(APPNAME) ./cmd/meshd + CGO_ENABLED=0 go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/$(APPNAME) ./cmd/meshd endif build-vendored: diff --git a/tests/starship/configs/local.yaml b/tests/starship/configs/local.yaml index de89d609..22b7c872 100644 --- a/tests/starship/configs/local.yaml +++ b/tests/starship/configs/local.yaml @@ -86,3 +86,13 @@ explorer: enabled: true ports: rest: 8080 + +timeouts: + time_iota_ms: 1000 + timeout_propose: 3000ms + timeout_propose_delta: 500ms + timeout_prevote: 1000ms + timeout_prevote_delta: 500ms + timeout_precommit: 1000ms + timeout_precommit_delta: 500ms + timeout_commit: 5000ms diff --git a/tests/starship/mvp_test.go b/tests/starship/mvp_test.go index 74345d43..1cbdcc54 100644 --- a/tests/starship/mvp_test.go +++ b/tests/starship/mvp_test.go @@ -35,7 +35,7 @@ func Test2WayContract(t *testing.T) { return false }, 120*time.Second, - time.Second, + 5*time.Second, "list remote validators failed: %v", qRsp, ) @@ -113,7 +113,7 @@ func Test2WayContract(t *testing.T) { return false }, 120*time.Second, - time.Second, + 5*time.Second, "list remote validators failed: %v", qRsp, ) diff --git a/tests/starship/setup/client.go b/tests/starship/setup/client.go index dd3d3446..04814254 100644 --- a/tests/starship/setup/client.go +++ b/tests/starship/setup/client.go @@ -183,7 +183,7 @@ func (c *Client) WaitForTx(t *testing.T, txHex string) { return false }, 300*time.Second, - time.Second, + 5*time.Second, "waited for too long, still txn not successful", ) require.NotNil(t, tx) diff --git a/tests/starship/setup/main.go b/tests/starship/setup/main.go index 2782af93..3d356a08 100644 --- a/tests/starship/setup/main.go +++ b/tests/starship/setup/main.go @@ -64,7 +64,7 @@ func MeshSecurity(provider, consumer, configFile, wasmContractPath string, wasmC if err != nil { return nil, nil, err } - time.Sleep(5 * time.Second) + time.Sleep(10 * time.Second) // get ibc denom from account balance coins, err := GetBalance(providerClient, providerClient.Address)