diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..077dba6e --- /dev/null +++ b/.gitignore @@ -0,0 +1,24 @@ +# Test binary, build with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Coverage artifacts +coverage.zip +coverage.txt +cover.json +cover-summary +index.html + +.DS_Store + +# Ignore flow json config +flow.json +flow*.json +!tests/flow.json + +# IDE related files +.idea +.vscode +git \ No newline at end of file diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..681796b0 --- /dev/null +++ b/Makefile @@ -0,0 +1,42 @@ +# The short Git commit hash +SHORT_COMMIT := $(shell git rev-parse --short HEAD) +# The Git commit hash +COMMIT := $(shell git rev-parse HEAD) +# The tag of the current commit, otherwise empty +VERSION := $(shell git describe --tags --abbrev=0 --exact-match 2>/dev/null) +# Name of the cover profile +COVER_PROFILE := coverage.txt +# Disable go sum database lookup for private repos +GOPRIVATE := github.com/dapperlabs/* +# Ensure go bin path is in path (Especially for CI) +GOPATH ?= $(HOME)/go +PATH := $(PATH):$(GOPATH)/bin +# OS +UNAME := $(shell uname) + +MIXPANEL_PROJECT_TOKEN := 3fae49de272be1ceb8cf34119f747073 + +.PHONY: test +test: + GO111MODULE=on go test -coverprofile=$(COVER_PROFILE) $(if $(JSON_OUTPUT),-json,) ./... + +.PHONY: install-tools +install-tools: + cd ${GOPATH}; \ + mkdir -p ${GOPATH}; \ + GO111MODULE=on go install github.com/axw/gocov/gocov@latest; \ + GO111MODULE=on go install github.com/matm/gocov-html/cmd/gocov-html@latest; \ + GO111MODULE=on go install github.com/sanderhahn/gozip/cmd/gozip@latest; \ + GO111MODULE=on go install github.com/vektra/mockery/v2@v2.38.0; + +.PHONY: generate-schema +generate-schema: + go run ./cmd/flow-schema/flow-schema.go ./schema.json + +.PHONY: check-schema +check-schema: + go run ./cmd/flow-schema/flow-schema.go --verify=true ./schema.json + +.PHONY: generate +generate: install-tools + go generate ./... \ No newline at end of file diff --git a/mocks/Services.go b/mocks/Services.go index 1e89d7c5..b1fd36f1 100644 --- a/mocks/Services.go +++ b/mocks/Services.go @@ -4,7 +4,6 @@ package mocks import ( cadence "github.com/onflow/cadence" - accounts "github.com/onflow/flowkit/accounts" config "github.com/onflow/flowkit/config"