Skip to content

Commit

Permalink
set timeout to 6s, disable cgo enabled in make build
Browse files Browse the repository at this point in the history
  • Loading branch information
Anmol1696 committed Dec 14, 2023
1 parent 7084a4e commit 53ca1d4
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion demo/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions tests/starship/configs/local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions tests/starship/mvp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
Expand Down Expand Up @@ -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,
)
Expand Down
2 changes: 1 addition & 1 deletion tests/starship/setup/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tests/starship/setup/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 53ca1d4

Please sign in to comment.