Skip to content

Commit

Permalink
Merge pull request #556 from iotaledger/develop
Browse files Browse the repository at this point in the history
0.2.1 release
  • Loading branch information
fijter authored Oct 27, 2021
2 parents aa4fbc9 + e27eae9 commit d9f5d68
Show file tree
Hide file tree
Showing 545 changed files with 6,085 additions and 2,626 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
run: make build

- name: Test
run: go test -tags rocksdb -v -short -failfast ./...
run: go test -tags rocksdb,builtin_static -v -short -failfast ./...

golangci:
name: lint
Expand Down
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
wasp.log
./wasp
./wasp-cli
/wasp
/wasp-cli
/wasp-cluster
/dbinspector
/evmemulator
/schema
/submsg
waspdb/
cluster-data/
dist/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG GOLANG_IMAGE_TAG=1.17-buster

# Build stage
FROM golang:${GOLANG_IMAGE_TAG} AS build
ARG BUILD_TAGS="rocksdb"
ARG BUILD_TAGS="rocksdb,builtin_static"
ARG BUILD_LD_FLAGS=""
ARG BUILD_TARGET="./..."

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ test: install
go test -tags $(BUILD_TAGS) ./... --timeout 30m --count 1 -failfast

test-short:
go test -tags $(BUILD_TAGS) --short --count 1 ./...
go test -tags $(BUILD_TAGS) --short --count 1 -failfast ./...

install:
go install -tags $(BUILD_TAGS) -ldflags $(BUILD_LD_FLAGS) ./...
Expand Down
3 changes: 3 additions & 0 deletions client/chainclient/checkrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ func (c *Client) CheckRequestResult(reqID iscp.RequestID) error {
if err != nil {
return xerrors.Errorf("Could not fetch receipt for request: %w", err)
}
if !ret.MustHas(blocklog.ParamRequestRecord) {
return xerrors.Errorf("Could not fetch receipt for request: not found in blocklog")
}
req, err := blocklog.RequestReceiptFromBytes(ret.MustGet(blocklog.ParamRequestRecord))
if err != nil {
return xerrors.Errorf("Could not decode receipt for request: %w", err)
Expand Down
2 changes: 0 additions & 2 deletions contracts/rust/build_all_go.bat

This file was deleted.

3 changes: 0 additions & 3 deletions contracts/rust/build_all_rust.bat

This file was deleted.

10 changes: 0 additions & 10 deletions contracts/rust/build_go.bat

This file was deleted.

9 changes: 0 additions & 9 deletions contracts/rust/build_rust.bat

This file was deleted.

16 changes: 0 additions & 16 deletions contracts/rust/fairroulette/frontend/src/components/index.ts

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion contracts/rust/fairroulette/frontend/src/global.d.ts

This file was deleted.

Loading

0 comments on commit d9f5d68

Please sign in to comment.