Skip to content

Commit

Permalink
more lint
Browse files Browse the repository at this point in the history
  • Loading branch information
keefertaylor committed Oct 24, 2023
1 parent 75e2876 commit 5343489
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
make_action: ["build", "lint"]
runs-on: ubuntu-latest
name: "${{matrix.make_action}} restake-go"
name: "${{matrix.make_action}} router"
steps:
- uses: actions/checkout@v3
- name: Setup Go
Expand Down
24 changes: 1 addition & 23 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,29 +1,7 @@
#!/usr/bin/make -f

DOCKER := $(shell which docker)

BUILDDIR ?= $(CURDIR)/build

BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
COMMIT := $(shell git log -1 --format='%H')

DIRTY := -dirty
ifeq (,$(shell git status --porcelain))
DIRTY :=
endif

VERSION := $(shell git describe --tags --exact-match 2>/dev/null)
# if VERSION is empty, then populate it with branch's name and raw commit hash
ifeq (,$(VERSION))
VERSION := $(BRANCH)-$(COMMIT)
endif

VERSION := $(VERSION)$(DIRTY)
GIT_REVISION := $(shell git rev-parse HEAD)$(DIRTY)
GO_SYSTEM_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1-2)

BUILD_FLAGS := -tags "$(build_tags)" -ldflags '$(ldflags)'

###############################################################################
### Build ###
###############################################################################
Expand All @@ -32,7 +10,7 @@ BUILD_TARGETS := build

build:
mkdir -p $(BUILDDIR)/
go build -mod=readonly -ldflags '$(ldflags)' -trimpath -o $(BUILDDIR) ./...;
go build -mod=readonly ./...;

clean:
rm -rf $(BUILDDIR)/*
Expand Down
2 changes: 0 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module github.com/tessellated-io/router

go 1.20

require github.com/tessellated-io/pickaxe v1.0.1 // indirect
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
github.com/tessellated-io/pickaxe v1.0.1 h1:3jQwi8tn6V7k+oK+AUx26gj3RRMsqgEq6fHqCdJK6B0=
github.com/tessellated-io/pickaxe v1.0.1/go.mod h1:BUuDKLC0P9Y098K24k+cOcy4/6rCuiHX8T2vPQGHAQA=
2 changes: 1 addition & 1 deletion router/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type chain struct {
var _ Chain = (*chain)(nil)

// Create a new Chain
func NewChain(chainName string, humanReadableName string, grpcEndpoint *string) (Chain, error) {
func NewChain(chainName, humanReadableName string, grpcEndpoint *string) (Chain, error) {
return &chain{
chainName: chainName,
humanReadableName: humanReadableName,
Expand Down

0 comments on commit 5343489

Please sign in to comment.