chore: fix ci

.github/workflows/ci.yml

@@ -7,12 +7,12 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: 1.18
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
-          version: v1.37
+          version: v1.47
           args: --concurrency 32 --deadline 4m
   build-test:
       name: build and test
@@ -21,7 +21,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.18.x
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Build

.github/workflows/docker-publish-edge.yml

@@ -4,6 +4,9 @@ on:
     branches:
       - master
 
+env:
+  REGISTRY: ghcr.io
+
 jobs:
   docker:
     runs-on: ubuntu-latest
@@ -14,15 +17,16 @@ jobs:
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
+      - name: Login to GHCR
         uses: docker/login-action@v2
         with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: "${{ env.ORGANIZATION }}/sync-service:edge"
+          tags: "${{ env.REGISTRY }}/celestiaorg/sync-service:edge"
           file: ./Dockerfile
           platforms: linux/arm64,linux/amd64

.gitignore

@@ -27,6 +27,9 @@ node_modules
 /vendor/
 /Godeps/
 
+### IDEA ###
+.idea/*
+
 ### VisualStudioCode ###
 .vscode/*
 

Dockerfile

@@ -3,7 +3,7 @@
 #:::
 
 # GO_VERSION is the golang version this image will be built against.
-ARG GO_VERSION=1.16
+ARG GO_VERSION=1.18
 
 # Dynamically select the golang version.
 FROM golang:${GO_VERSION}-buster

Makefile

@@ -12,7 +12,7 @@ build:
 	cd cmd && go build -o ../sync-service
 
 docker:
-	docker build -t iptestground/sync-service:latest -f Dockerfile .
+	docker build -t celestiaorg/sync-service:latest -f Dockerfile .
 
 test:
 	go test -v ./...

connection.go

@@ -11,6 +11,8 @@ import (
 	"nhooyr.io/websocket/wsjson"
 )
 
+const timeout = time.Minute * 5
+
 type connection struct {
 	*websocket.Conn
 	service   Service
@@ -57,7 +59,7 @@ func (c *connection) consumeRequests() error {
 }
 
 func (c *connection) publishHandler(id string, req *PublishRequest) {
-	ctx, cancel := context.WithTimeout(c.ctx, time.Second*10)
+	ctx, cancel := context.WithTimeout(c.ctx, timeout)
 	defer cancel()
 
 	resp := &Response{ID: id}
@@ -113,7 +115,7 @@ func (c *connection) barrierHandler(id string, req *BarrierRequest) {
 }
 
 func (c *connection) signalEntryHandler(id string, req *SignalEntryRequest) {
-	ctx, cancel := context.WithTimeout(c.ctx, time.Second*10)
+	ctx, cancel := context.WithTimeout(c.ctx, timeout)
 	defer cancel()
 
 	resp := &Response{ID: id}
@@ -132,7 +134,7 @@ func (c *connection) consumeResponses() error {
 	for {
 		select {
 		case resp := <-c.responses:
-			err := c.writeTimeout(time.Second*10, resp)
+			err := c.writeTimeout(timeout, resp)
 			if err != nil {
 				return err
 			}

pubsub.go

@@ -128,7 +128,7 @@ func (ps *pubsub) writeMessages() {
 			defer ps.msgsMu.RUnlock()
 
 			for _, msg := range ps.msgs[sub.last:] {
-				err := sub.write(time.Second*5, msg)
+				err := sub.write(time.Minute, msg)
 				if err != nil {
 					log.Warnf("cannot send message to subscriber: %w", err)
 					break