Skip to content

Commit

Permalink
fix package name, version
Browse files Browse the repository at this point in the history
  • Loading branch information
metachris committed Oct 24, 2024
1 parent ca2de2e commit 0d86deb
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: go install honnef.co/go/tools/cmd/[email protected]

- name: Install golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.60.3
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.61.0

- name: Install NilAway
run: go install go.uber.org/nilaway/cmd/[email protected]
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ v:
clean:
rm -rf build/

.PHONY: build-cli
.PHONY: build
build:
@mkdir -p ./build
go build -trimpath -ldflags "-X github.com/flashbots/builder-tools/common.Version=${VERSION}" -v -o ./build/system-api cmd/system-api/*.go
go build -trimpath -ldflags "-X github.com/flashbots/system-api/common.Version=${VERSION}" -v -o ./build/system-api cmd/system-api/*.go

# .PHONY: build-httpserver
# build-httpserver:
# @mkdir -p ./build
# go build -trimpath -ldflags "-X github.com/flashbots/builder-tools/common.Version=${VERSION}" -v -o ./build/httpserver cmd/httpserver/main.go
# go build -trimpath -ldflags "-X github.com/flashbots/system-api/common.Version=${VERSION}" -v -o ./build/httpserver cmd/httpserver/main.go

.PHONY: test
test:
Expand Down
2 changes: 1 addition & 1 deletion cmd/ecdsa-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/crypto"
"github.com/flashbots/builder-tools/common"
"github.com/flashbots/system-api/common"
cli "github.com/urfave/cli/v2" // imports as package "cli"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/https-client/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/http"
"os"

"github.com/flashbots/builder-tools/common"
"github.com/flashbots/system-api/common"
cli "github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/https-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"os"
"time"

"github.com/flashbots/builder-tools/common"
"github.com/flashbots/system-api/common"
cli "github.com/urfave/cli/v2" // imports as package "cli"
)

Expand Down
15 changes: 9 additions & 6 deletions cmd/system-api/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"syscall"
"time"

"github.com/flashbots/builder-tools/common"
"github.com/flashbots/system-api/common"
cli "github.com/urfave/cli/v2" // imports as package "cli"
)

Expand All @@ -27,10 +27,11 @@ var flags []cli.Flag = []cli.Flag{

func main() {
app := &cli.App{
Name: "system-api",
Usage: "HTTP API for status events",
Flags: flags,
Action: runCli,
Name: "system-api",
Usage: "HTTP API for status events",
Version: common.Version,
Flags: flags,
Action: runCli,
}

if err := app.Run(os.Args); err != nil {
Expand All @@ -42,7 +43,9 @@ func runCli(cCtx *cli.Context) error {
listenAddr := cCtx.String("listen-addr")
pipeFile := cCtx.String("pipe-file")

log := common.SetupLogger(&common.LoggingOpts{})
log := common.SetupLogger(&common.LoggingOpts{
Version: common.Version,
})

// Setup and start the server (in the background)
server, err := NewServer(&HTTPServerConfig{
Expand Down
2 changes: 1 addition & 1 deletion cmd/system-api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"syscall"
"time"

"github.com/flashbots/builder-tools/common"
"github.com/flashbots/system-api/common"
chi "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tls-gen/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"os"
"time"

"github.com/flashbots/builder-tools/crypto"
"github.com/flashbots/system-api/crypto"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion common/vars.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ package common
var Version = "dev"

const (
PackageName = "github.com/flashbots/builder-tools"
PackageName = "github.com/flashbots/system-api"
)
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/flashbots/builder-tools
module github.com/flashbots/system-api

go 1.22

Expand Down

0 comments on commit 0d86deb

Please sign in to comment.