Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: improve code clarity and add fmt and lint ci #3

Merged
merged 1 commit into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/ci-lint-and-format.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Lint and Format

on:
pull_request:
push:
branches: [main]

jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/setup-go@v4
with:
go-version: '1.19'
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.54
- uses: pre-commit/[email protected]
File renamed without changes.
6 changes: 6 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
repos:
- repo: https://github.com/dnephin/pre-commit-golang
rev: v0.5.1
hooks:
- id: go-fmt
- id: golangci-lint
10 changes: 8 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,19 @@ func main() {
go func() {
log.Info().Str("url", cli.MetricsURL).Msg("Starting metrics server")
http.Handle("/metrics", promhttp.Handler())
http.ListenAndServe(cli.MetricsURL, nil)
err := http.ListenAndServe(cli.MetricsURL, nil)
if err != nil {
log.Panic().Err(err).Msg("Failed to start metrics server")
}
}()

go func() {
log.Info().Str("url", cli.HeartbeatURL).Msg("Starting heartbeat server")
http.HandleFunc("/", heartbeat.Handle)
http.ListenAndServe(cli.HeartbeatURL, nil)
err := http.ListenAndServe(cli.HeartbeatURL, nil)
if err != nil {
log.Panic().Err(err).Msg("Failed to start heartbeat server")
}
}()

log.Info().Msg("Starting receive/write/serve goroutines")
Expand Down
27 changes: 12 additions & 15 deletions serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,18 @@ type server struct {

func (s server) SubscribeSignedVAA(req *spyv1.SubscribeSignedVAARequest, server spyv1.SpyRPCService_SubscribeSignedVAAServer) error {
var fi []filterSignedVaa
if req.Filters != nil {
for _, f := range req.Filters {
switch t := f.Filter.(type) {
case *spyv1.FilterEntry_EmitterFilter:
addr, err := vaa.StringToAddress(t.EmitterFilter.EmitterAddress)
if err != nil {
return status.Error(codes.InvalidArgument, fmt.Sprintf("failed to decode emitter address: %v", err))
}
fi = append(fi, filterSignedVaa{
chainId: vaa.ChainID(t.EmitterFilter.ChainId),
emitterAddr: addr,
})
default:
return status.Error(codes.InvalidArgument, "unsupported filter type")
for _, f := range req.Filters {
if t, ok := f.Filter.(*spyv1.FilterEntry_EmitterFilter); ok {
addr, err := vaa.StringToAddress(t.EmitterFilter.EmitterAddress)
if err != nil {
return status.Error(codes.InvalidArgument, fmt.Sprintf("failed to decode emitter address: %v", err))
}
fi = append(fi, filterSignedVaa{
chainId: vaa.ChainID(t.EmitterFilter.ChainId),
emitterAddr: addr,
})
} else {
return status.Error(codes.InvalidArgument, "unsupported filter type")
}
}

Expand Down Expand Up @@ -93,7 +90,7 @@ func (s server) SubscribeSignedVAA(req *spyv1.SubscribeSignedVAARequest, server
}

// Check if the VAA matches any of the filters
var found bool = false
found := false
for _, f := range fi {
if f.chainId == vaaMsg.EmitterChain && f.emitterAddr == vaaMsg.EmitterAddress {
found = true
Expand Down
Loading