Skip to content

Commit c36f389

Browse files
D4ryl00D4ryl00
committed
fix: update and fix lint
Signed-off-by: D4ryl00 <[email protected]>
1 parent b71659a commit c36f389

File tree

16 files changed

+33
-28
lines changed

16 files changed

+33
-28
lines changed

‎.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
golang 1.21.8
2-
golangci-lint 1.50.1
2+
golangci-lint 1.57.2

‎accesscontroller/ipfs/accesscontroller_ipfs.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (i *ipfsAccessController) Address() address.Address {
3838
return nil
3939
}
4040

41-
func (i *ipfsAccessController) CanAppend(entry logac.LogEntry, p identityprovider.Interface, additionalContext accesscontroller.CanAppendAdditionalContext) error {
41+
func (i *ipfsAccessController) CanAppend(entry logac.LogEntry, p identityprovider.Interface, _ accesscontroller.CanAppendAdditionalContext) error {
4242
i.muWriteAccess.RLock()
4343
defer i.muWriteAccess.RUnlock()
4444

@@ -63,11 +63,11 @@ func (i *ipfsAccessController) GetAuthorizedByRole(role string) ([]string, error
6363
return nil, nil
6464
}
6565

66-
func (i *ipfsAccessController) Grant(ctx context.Context, capability string, keyID string) error {
66+
func (i *ipfsAccessController) Grant(ctx context.Context, capability string, keyID string) error { //nolint:all
6767
return fmt.Errorf("not implemented - does not exist in JS version")
6868
}
6969

70-
func (i *ipfsAccessController) Revoke(ctx context.Context, capability string, keyID string) error {
70+
func (i *ipfsAccessController) Revoke(ctx context.Context, capability string, keyID string) error { //nolint:all
7171
return fmt.Errorf("not implemented - does not exist in JS version")
7272
}
7373

‎accesscontroller/orbitdb/accesscontroller_orbitdb.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func (o *orbitDBAccessController) getAuthorizations() (map[string][]string, erro
112112
return authorizationsLists, nil
113113
}
114114

115-
func (o *orbitDBAccessController) CanAppend(entry logac.LogEntry, p identityprovider.Interface, additionalContext accesscontroller.CanAppendAdditionalContext) error {
115+
func (o *orbitDBAccessController) CanAppend(entry logac.LogEntry, p identityprovider.Interface, _ accesscontroller.CanAppendAdditionalContext) error {
116116
writeAccess, err := o.GetAuthorizedByRole("write")
117117
if err != nil {
118118
return fmt.Errorf("unable to get keys with write access: %w", err)
@@ -249,7 +249,7 @@ func (o *orbitDBAccessController) Load(ctx context.Context, address string) erro
249249
return nil
250250
}
251251

252-
func (o *orbitDBAccessController) Save(ctx context.Context) (accesscontroller.ManifestParams, error) {
252+
func (o *orbitDBAccessController) Save(_ context.Context) (accesscontroller.ManifestParams, error) {
253253
return accesscontroller.NewManifestParams(o.kvStore.Address().GetRoot(), false, "orbitdb"), nil
254254
}
255255

@@ -261,7 +261,7 @@ func (o *orbitDBAccessController) Close() error {
261261
return nil
262262
}
263263

264-
func (o *orbitDBAccessController) onUpdate(ctx context.Context) {
264+
func (o *orbitDBAccessController) onUpdate(_ context.Context) {
265265
if err := o.emitterEvtUpdated.Emit(&EventUpdated{}); err != nil {
266266
o.logger.Warn("unable to emit event updated", zap.Error(err))
267267
}

‎accesscontroller/simple/accesscontroller_simple.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ func (o *simpleAccessController) Address() address.Address {
3838
return nil
3939
}
4040

41-
func (o *simpleAccessController) Grant(ctx context.Context, capability string, keyID string) error {
41+
func (o *simpleAccessController) Grant(ctx context.Context, capability string, keyID string) error { //nolint:all
4242
return nil
4343
}
4444

45-
func (o *simpleAccessController) Revoke(ctx context.Context, capability string, keyID string) error {
45+
func (o *simpleAccessController) Revoke(ctx context.Context, capability string, keyID string) error { //nolint:all
4646
return nil
4747
}
4848

49-
func (o *simpleAccessController) Load(ctx context.Context, address string) error {
49+
func (o *simpleAccessController) Load(ctx context.Context, address string) error { //nolint:all
5050
return nil
5151
}
5252

53-
func (o *simpleAccessController) Save(ctx context.Context) (accesscontroller.ManifestParams, error) {
53+
func (o *simpleAccessController) Save(_ context.Context) (accesscontroller.ManifestParams, error) {
5454
return accesscontroller.NewManifestParams(cid.Cid{}, true, "simple"), nil
5555
}
5656

@@ -66,7 +66,7 @@ func (o *simpleAccessController) GetAuthorizedByRole(role string) ([]string, err
6666
return o.allowedKeys[role], nil
6767
}
6868

69-
func (o *simpleAccessController) CanAppend(e logac.LogEntry, p identityprovider.Interface, additionalContext accesscontroller.CanAppendAdditionalContext) error {
69+
func (o *simpleAccessController) CanAppend(e logac.LogEntry, _ identityprovider.Interface, _ accesscontroller.CanAppendAdditionalContext) error {
7070
for _, id := range o.allowedKeys["write"] {
7171
if e.GetIdentity().ID == id || id == "*" {
7272
return nil

‎baseorbitdb/orbitdb.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
peer "github.com/libp2p/go-libp2p/core/peer"
3232
"github.com/libp2p/go-libp2p/p2p/host/eventbus"
3333
"go.opentelemetry.io/otel/trace"
34+
tracenoop "go.opentelemetry.io/otel/trace/noop"
3435
"go.uber.org/zap"
3536
)
3637

@@ -334,7 +335,7 @@ func newOrbitDB(ctx context.Context, is coreiface.CoreAPI, identity *idp.Identit
334335
}
335336

336337
if options.Tracer == nil {
337-
options.Tracer = trace.NewNoopTracerProvider().Tracer("")
338+
options.Tracer = tracenoop.NewTracerProvider().Tracer("")
338339
}
339340

340341
if options.EventBus == nil {

‎events/events.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type eventBox struct {
4646

4747
// Deprecated: use event bus directly
4848
// Emit Sends an event to the subscribed listeners
49-
func (e *EventEmitter) Emit(ctx context.Context, evt Event) {
49+
func (e *EventEmitter) Emit(_ context.Context, evt Event) {
5050
e.muEmitters.Lock()
5151

5252
bus := e.getBus()

‎pubsub/directchannel/channel.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func (d *directChannel) handleNewPeer(s network.Stream) {
7676

7777
// @NOTE(gfanton): we dont need this on direct channel
7878
// Connect Waits for the other peer to be connected
79-
func (d *directChannel) Connect(ctx context.Context, pid peer.ID) (err error) {
79+
func (d *directChannel) Connect(ctx context.Context, pid peer.ID) (err error) { //nolint:all
8080
return nil
8181
}
8282

@@ -92,7 +92,7 @@ type holderChannels struct {
9292
logger *zap.Logger
9393
}
9494

95-
func (c *holderChannels) NewChannel(ctx context.Context, emitter iface.DirectChannelEmitter, opts *iface.DirectChannelOptions) (iface.DirectChannel, error) {
95+
func (c *holderChannels) NewChannel(_ context.Context, emitter iface.DirectChannelEmitter, opts *iface.DirectChannelOptions) (iface.DirectChannel, error) {
9696
if opts == nil {
9797
opts = &iface.DirectChannelOptions{}
9898
}

‎pubsub/pubsubcoreapi/pubsub.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"github.com/ipfs/kubo/core/coreiface/options"
1010
"github.com/libp2p/go-libp2p/core/peer"
1111
"go.opentelemetry.io/otel/trace"
12+
tracenoop "go.opentelemetry.io/otel/trace/noop"
1213
"go.uber.org/zap"
1314

1415
"berty.tech/go-orbit-db/events"
@@ -172,7 +173,7 @@ func NewPubSub(api coreiface.CoreAPI, id peer.ID, pollInterval time.Duration, lo
172173
}
173174

174175
if tracer == nil {
175-
tracer = trace.NewNoopTracerProvider().Tracer("")
176+
tracer = tracenoop.NewTracerProvider().Tracer("")
176177
}
177178

178179
return &coreAPIPubSub{

‎pubsub/pubsubraw/pubsub.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
p2ppubsub "github.com/libp2p/go-libp2p-pubsub"
88
"github.com/libp2p/go-libp2p/core/peer"
99
"go.opentelemetry.io/otel/trace"
10+
tracernoop "go.opentelemetry.io/otel/trace/noop"
1011
"go.uber.org/zap"
1112

1213
"berty.tech/go-orbit-db/events"
@@ -141,7 +142,7 @@ func NewPubSub(ps *p2ppubsub.PubSub, id peer.ID, logger *zap.Logger, tracer trac
141142
}
142143

143144
if tracer == nil {
144-
tracer = trace.NewNoopTracerProvider().Tracer("")
145+
tracer = tracernoop.NewTracerProvider().Tracer("")
145146
}
146147

147148
return &rawPubSub{

‎stores/basestore/base_index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func (b *baseIndex) Get(_ string) interface{} {
2020
return b.index
2121
}
2222

23-
func (b *baseIndex) UpdateIndex(log ipfslog.Log, entries []ipfslog.Entry) error {
23+
func (b *baseIndex) UpdateIndex(log ipfslog.Log, _ []ipfslog.Entry) error {
2424
b.mu.Lock()
2525
defer b.mu.Unlock()
2626
b.index = log.Values().Slice()

‎stores/basestore/base_store.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"github.com/pkg/errors"
3535
otkv "go.opentelemetry.io/otel/attribute"
3636
"go.opentelemetry.io/otel/trace"
37+
tracenoop "go.opentelemetry.io/otel/trace/noop"
3738
"go.uber.org/zap"
3839
)
3940

@@ -180,7 +181,7 @@ func (b *BaseStore) InitBaseStore(ipfs coreiface.CoreAPI, identity *identityprov
180181
b.messageMarshaler = options.MessageMarshaler
181182

182183
if options.Tracer == nil {
183-
options.Tracer = trace.NewNoopTracerProvider().Tracer("")
184+
options.Tracer = tracenoop.NewTracerProvider().Tracer("")
184185
}
185186

186187
if identity == nil {
@@ -662,7 +663,7 @@ func (b *BaseStore) Sync(ctx context.Context, heads []ipfslog.Entry) error {
662663
return nil
663664
}
664665

665-
func (b *BaseStore) LoadMoreFrom(ctx context.Context, amount uint, entries []ipfslog.Entry) {
666+
func (b *BaseStore) LoadMoreFrom(ctx context.Context, amount uint, entries []ipfslog.Entry) { //nolint:all
666667
b.Replicator().Load(ctx, entries)
667668
// TODO: can this return an error?
668669
}

‎stores/documentstore/document.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type orbitDBDocumentStore struct {
2020
docOpts *iface.CreateDocumentDBOptions
2121
}
2222

23-
func (o *orbitDBDocumentStore) Get(ctx context.Context, key string, opts *iface.DocumentStoreGetOptions) ([]interface{}, error) {
23+
func (o *orbitDBDocumentStore) Get(_ context.Context, key string, opts *iface.DocumentStoreGetOptions) ([]interface{}, error) {
2424
if opts == nil {
2525
opts = &iface.DocumentStoreGetOptions{}
2626
}
@@ -179,7 +179,7 @@ func (o *orbitDBDocumentStore) PutAll(ctx context.Context, values []interface{})
179179
}
180180

181181
// Query Finds documents using a filter function
182-
func (o *orbitDBDocumentStore) Query(ctx context.Context, filter func(doc interface{}) (bool, error)) ([]interface{}, error) {
182+
func (o *orbitDBDocumentStore) Query(_ context.Context, filter func(doc interface{}) (bool, error)) ([]interface{}, error) {
183183
docIndex, ok := o.Index().(*documentIndex)
184184
if !ok {
185185
return nil, fmt.Errorf("unable to cast index to documentIndex")

‎stores/eventlogstore/index.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type eventIndex struct {
1212
lock sync.RWMutex
1313
}
1414

15-
func (i *eventIndex) Get(key string) interface{} {
15+
func (i *eventIndex) Get(key string) interface{} { //nolint:all
1616
i.lock.RLock()
1717
defer i.lock.RUnlock()
1818

‎stores/eventlogstore/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (o *orbitDBEventLogStore) Get(ctx context.Context, cid cid.Cid) (operation.
8080
}
8181
}
8282

83-
func (o *orbitDBEventLogStore) Stream(ctx context.Context, resultChan chan operation.Operation, options *iface.StreamOptions) error {
83+
func (o *orbitDBEventLogStore) Stream(_ context.Context, resultChan chan operation.Operation, options *iface.StreamOptions) error {
8484
defer close(resultChan)
8585
messages, err := o.query(options)
8686
if err != nil {

‎stores/kvstore/keyvalue.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func (o *orbitDBKeyValue) Delete(ctx context.Context, key string) (operation.Ope
6767
return op, nil
6868
}
6969

70-
func (o *orbitDBKeyValue) Get(ctx context.Context, key string) ([]byte, error) {
70+
func (o *orbitDBKeyValue) Get(_ context.Context, key string) ([]byte, error) {
7171
value, ok := o.Index().(*kvIndex).Get(key).([]byte)
7272
if value == nil {
7373
return nil, nil

‎stores/replicator/replicator.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414
"github.com/libp2p/go-libp2p/p2p/host/eventbus"
1515
otkv "go.opentelemetry.io/otel/attribute"
1616
"go.opentelemetry.io/otel/trace"
17+
tracenoop "go.opentelemetry.io/otel/trace/noop"
1718
"go.uber.org/zap"
1819
"golang.org/x/sync/semaphore"
1920
)
@@ -77,7 +78,7 @@ func NewReplicator(store storeInterface, concurrency uint, opts *Options) (Repli
7778
}
7879

7980
if opts.Tracer == nil {
80-
opts.Tracer = trace.NewNoopTracerProvider().Tracer("")
81+
opts.Tracer = tracenoop.NewTracerProvider().Tracer("")
8182
}
8283

8384
if concurrency == 0 {
@@ -178,7 +179,7 @@ func (r *replicator) Load(ctx context.Context, entries []ipfslog.Entry) {
178179
wg.Add(1)
179180

180181
// add one process
181-
go func(i int) {
182+
go func(_ int) {
182183
if err := r.processOne(ctx, &wg); err != nil {
183184
r.logger.Warn("unable to process entry", zap.Error(err))
184185
}

0 commit comments

Comments
 (0)