Skip to content
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
2 changes: 1 addition & 1 deletion .github/docker-compose/nwaku.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
nwaku:
image: "harbor.status.im/wakuorg/nwaku:latest"
image: "harbor.status.im/wakuorg/nwaku:v0.35.1"
command:
[
"--relay",
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ jobs:
- name: Execute golangci-lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.55.2
args: --deadline=5m
version: v1.64.6
args: --timeout=5m

build:
needs: [changes, env]
Expand Down
4 changes: 2 additions & 2 deletions ci/Jenkinsfile.nix-flake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library '[email protected].16'
library '[email protected].26'

pipeline {
agent {
Expand Down Expand Up @@ -28,7 +28,7 @@ pipeline {
stages {
stage('Build') {
steps { script {
nix.flake('node',[path: 'git+https://github.com/waku-org/go-waku'])
nix.flake('node')
} }
}
stage('Check') {
Expand Down
7 changes: 4 additions & 3 deletions waku/v2/protocol/filter/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (
libp2pProtocol "github.com/libp2p/go-libp2p/core/protocol"
"github.com/libp2p/go-msgio/pbio"
"github.com/prometheus/client_golang/prometheus"
"go.uber.org/zap"

"github.com/waku-org/go-waku/logging"
"github.com/waku-org/go-waku/waku/v2/peermanager"
"github.com/waku-org/go-waku/waku/v2/protocol"
Expand All @@ -21,7 +23,6 @@ import (
"github.com/waku-org/go-waku/waku/v2/service"
"github.com/waku-org/go-waku/waku/v2/timesource"
"github.com/waku-org/go-waku/waku/v2/utils"
"go.uber.org/zap"
)

// FilterSubscribeID_v20beta1 is the current Waku Filter protocol identifier for servers to
Expand Down Expand Up @@ -282,7 +283,7 @@ func (wf *WakuFilterFullNode) pushMessage(ctx context.Context, logger *zap.Logge

stream, err := wf.h.NewStream(ctx, peerID, FilterPushID_v20beta1)
if err != nil {
if errors.Is(context.DeadlineExceeded, err) {
if errors.Is(err, context.DeadlineExceeded) {
wf.metrics.RecordError(pushTimeoutFailure)
} else {
wf.metrics.RecordError(dialFailure)
Expand All @@ -297,7 +298,7 @@ func (wf *WakuFilterFullNode) pushMessage(ctx context.Context, logger *zap.Logge
writer := pbio.NewDelimitedWriter(stream)
err = writer.WriteMsg(messagePush)
if err != nil {
if errors.Is(context.DeadlineExceeded, err) {
if errors.Is(err, context.DeadlineExceeded) {
wf.metrics.RecordError(pushTimeoutFailure)
} else {
wf.metrics.RecordError(writeResponseFailure)
Expand Down
Loading