diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 316ca6bd..ada305cf 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup asdf uses: asdf-vm/actions/setup@v1 @@ -77,7 +77,7 @@ jobs: uses: actions/cache@v2.1.6 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}- - name: Avoid triggering make generate @@ -127,7 +127,7 @@ jobs: uses: actions/cache@v2.1.6 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}- - name: Check go.mod and go.sum @@ -191,7 +191,7 @@ jobs: uses: actions/cache@v2.1.6 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}- - name: Check go.mod and go.sum @@ -235,7 +235,7 @@ jobs: uses: actions/cache@v2.1.6 with: path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} + key: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}-${{ hashFiles('**/go.sum') }} restore-keys: ${{ runner.os }}-go-${{ env.go_version }}-${{ env.json_cache-versions_go }}- - name: Check go.mod and go.sum diff --git a/.golangci.yml b/.golangci.yml index 6c969d53..63136f48 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,7 +1,8 @@ run: deadline: 1m tests: false - skip-files: +issues: + exclude-files: - ".*\\.pb\\.go$" - ".*\\.pb\\.gw\\.go$" - ".*\\.gen\\.go$" @@ -29,7 +30,7 @@ linters: enable: - asciicheck - bodyclose - - depguard + #- depguard - dogsled - errcheck #- exhaustive # nice to have @@ -62,4 +63,3 @@ linters: - unparam - unused - whitespace - - unused diff --git a/.tool-versions b/.tool-versions index 9887ac49..747645fb 100644 --- a/.tool-versions +++ b/.tool-versions @@ -10,15 +10,8 @@ golang 1.22.5 #----- # This is simply the most recent golangci-lint version available to date. -# -# @TODO(gfanton): check if we still have this issue -# The current version of golangci-lint also has a problem displaying logs on -# Github actions, see: https://github.com/golangci/golangci-lint-action/issues/119 -# -# It would be good to update it (when possible) to a version that fixes this log -# issue and to update the golangci-lint Github Actions step accordingly. -#----- -golangci-lint 1.51.2 +#----- +golangci-lint 1.59.1 #----- # This is simply the most recent jq version available to date. diff --git a/api_client.go b/api_client.go index f4dd33c6..f629f342 100644 --- a/api_client.go +++ b/api_client.go @@ -56,7 +56,7 @@ func (s *service) ServiceExportData(_ *protocoltypes.ServiceExportData_Request, return nil } -func (s *service) ServiceGetConfiguration(ctx context.Context, req *protocoltypes.ServiceGetConfiguration_Request) (*protocoltypes.ServiceGetConfiguration_Reply, error) { +func (s *service) ServiceGetConfiguration(ctx context.Context, _ *protocoltypes.ServiceGetConfiguration_Request) (*protocoltypes.ServiceGetConfiguration_Reply, error) { key, err := s.ipfsCoreAPI.Key().Self(ctx) if err != nil { return nil, errcode.ErrCode_TODO.Wrap(err) diff --git a/api_contactrequest.go b/api_contactrequest.go index c5e07844..95d38d91 100644 --- a/api_contactrequest.go +++ b/api_contactrequest.go @@ -12,7 +12,7 @@ import ( ) // ContactRequestReference retrieves the necessary information to create a contact link -func (s *service) ContactRequestReference(ctx context.Context, _ *protocoltypes.ContactRequestReference_Request) (*protocoltypes.ContactRequestReference_Reply, error) { +func (s *service) ContactRequestReference(context.Context, *protocoltypes.ContactRequestReference_Request) (*protocoltypes.ContactRequestReference_Reply, error) { accountGroup := s.getAccountGroup() if accountGroup == nil { return nil, errcode.ErrCode_ErrGroupMissing @@ -180,7 +180,7 @@ func (s *service) ContactRequestDiscard(ctx context.Context, req *protocoltypes. // ShareContact uses ContactRequestReference to get the contact information for the current account and // returns the Protobuf encoding which you can further encode and share. If needed, his will reset the // contact request reference and enable contact requests. -func (s *service) ShareContact(ctx context.Context, req *protocoltypes.ShareContact_Request) (_ *protocoltypes.ShareContact_Reply, err error) { +func (s *service) ShareContact(ctx context.Context, _ *protocoltypes.ShareContact_Request) (_ *protocoltypes.ShareContact_Reply, err error) { accountGroup := s.getAccountGroup() if accountGroup == nil { return nil, errcode.ErrCode_ErrGroupMissing @@ -232,7 +232,7 @@ func (s *service) ShareContact(ctx context.Context, req *protocoltypes.ShareCont } // DecodeContact decodes the Protobuf encoding of a shareable contact which was returned by ShareContact. -func (s *service) DecodeContact(ctx context.Context, req *protocoltypes.DecodeContact_Request) (_ *protocoltypes.DecodeContact_Reply, err error) { +func (s *service) DecodeContact(_ context.Context, req *protocoltypes.DecodeContact_Request) (_ *protocoltypes.DecodeContact_Reply, err error) { contact := &protocoltypes.ShareableContact{} if err := proto.Unmarshal(req.EncodedContact, contact); err != nil { panic(err) diff --git a/api_debug.go b/api_debug.go index afe25299..4d2aa642 100644 --- a/api_debug.go +++ b/api_debug.go @@ -19,7 +19,7 @@ import ( "berty.tech/weshnet/pkg/protocoltypes" ) -func (s *service) DebugListGroups(req *protocoltypes.DebugListGroups_Request, srv protocoltypes.ProtocolService_DebugListGroupsServer) error { +func (s *service) DebugListGroups(_ *protocoltypes.DebugListGroups_Request, srv protocoltypes.ProtocolService_DebugListGroupsServer) error { accountGroup := s.getAccountGroup() if accountGroup == nil { return errcode.ErrCode_ErrGroupMissing @@ -176,7 +176,7 @@ func (s *service) DebugGroup(ctx context.Context, request *protocoltypes.DebugGr return rep, nil } -func (s *service) SystemInfo(ctx context.Context, request *protocoltypes.SystemInfo_Request) (*protocoltypes.SystemInfo_Reply, error) { +func (s *service) SystemInfo(ctx context.Context, _ *protocoltypes.SystemInfo_Request) (*protocoltypes.SystemInfo_Reply, error) { reply := protocoltypes.SystemInfo_Reply{} // process @@ -232,7 +232,7 @@ func (s *service) SystemInfo(ctx context.Context, request *protocoltypes.SystemI return &reply, nil } -func (s *service) PeerList(ctx context.Context, request *protocoltypes.PeerList_Request) (*protocoltypes.PeerList_Reply, error) { +func (s *service) PeerList(ctx context.Context, _ *protocoltypes.PeerList_Request) (*protocoltypes.PeerList_Reply, error) { reply := protocoltypes.PeerList_Reply{} api := s.IpfsCoreAPI() if api == nil { diff --git a/api_event.go b/api_event.go index 9c6af9dc..cf61540b 100644 --- a/api_event.go +++ b/api_event.go @@ -53,7 +53,7 @@ func (s *service) GroupMetadataList(req *protocoltypes.GroupMetadataList_Request if req.UntilId == nil && !req.UntilNow { sub, err := cg.MetadataStore().EventBus().Subscribe([]interface{}{ // new(stores.EventReplicated), - new(protocoltypes.GroupMetadataEvent), + new(*protocoltypes.GroupMetadataEvent), }, eventbus.Name("weshnet/api/group-metadata-list"), eventbus.BufSize(32)) if err != nil { return fmt.Errorf("unable to subscribe to new events") @@ -63,7 +63,7 @@ func (s *service) GroupMetadataList(req *protocoltypes.GroupMetadataList_Request } // Subscribe to previous metadata events and stream them if requested - previousEvents := make(chan protocoltypes.GroupMetadataEvent) + previousEvents := make(chan *protocoltypes.GroupMetadataEvent) if !req.SinceNow { pevt, err := cg.MetadataStore().ListEvents(ctx, req.SinceId, req.UntilId, req.ReverseOrder) if err != nil { @@ -84,7 +84,7 @@ func (s *service) GroupMetadataList(req *protocoltypes.GroupMetadataList_Request if req.UntilNow { cancel() } else { - previousEvents <- protocoltypes.GroupMetadataEvent{EventContext: nil} + previousEvents <- &protocoltypes.GroupMetadataEvent{EventContext: nil} } cg.logger.Debug("GroupMetadataList: previous events stream ended") @@ -92,7 +92,7 @@ func (s *service) GroupMetadataList(req *protocoltypes.GroupMetadataList_Request return } - previousEvents <- *evt + previousEvents <- evt } }() } @@ -107,12 +107,12 @@ func (s *service) GroupMetadataList(req *protocoltypes.GroupMetadataList_Request case event = <-newEvents: } - msg := event.(protocoltypes.GroupMetadataEvent) + msg := event.(*protocoltypes.GroupMetadataEvent) if msg.EventContext == nil { continue } - if err := sub.Send(&msg); err != nil { + if err := sub.Send(msg); err != nil { return err } @@ -140,7 +140,7 @@ func (s *service) GroupMessageList(req *protocoltypes.GroupMessageList_Request, var newEvents <-chan interface{} if req.UntilId == nil && !req.UntilNow { messageStoreSub, err := cg.MessageStore().EventBus().Subscribe([]interface{}{ - new(protocoltypes.GroupMessageEvent), + new(*protocoltypes.GroupMessageEvent), }, eventbus.Name("weshnet/api/group-message-list")) if err != nil { return fmt.Errorf("unable to subscribe to new events") @@ -150,7 +150,7 @@ func (s *service) GroupMessageList(req *protocoltypes.GroupMessageList_Request, } // Subscribe to previous message events and stream them if requested - previousEvents := make(chan protocoltypes.GroupMessageEvent) + previousEvents := make(chan *protocoltypes.GroupMessageEvent) if !req.SinceNow { pevt, err := cg.MessageStore().ListEvents(ctx, req.SinceId, req.UntilId, req.ReverseOrder) if err != nil { @@ -171,7 +171,7 @@ func (s *service) GroupMessageList(req *protocoltypes.GroupMessageList_Request, if req.UntilNow { cancel() } else { - previousEvents <- protocoltypes.GroupMessageEvent{EventContext: nil} + previousEvents <- &protocoltypes.GroupMessageEvent{EventContext: nil} } cg.logger.Debug("GroupMessageList: previous events stream ended") @@ -179,7 +179,7 @@ func (s *service) GroupMessageList(req *protocoltypes.GroupMessageList_Request, return } - previousEvents <- *evt + previousEvents <- evt } }() } @@ -195,12 +195,12 @@ func (s *service) GroupMessageList(req *protocoltypes.GroupMessageList_Request, case event = <-newEvents: } - msg := event.(protocoltypes.GroupMessageEvent) + msg := event.(*protocoltypes.GroupMessageEvent) if msg.EventContext == nil { continue } - if err := sub.Send(&msg); err != nil { + if err := sub.Send(msg); err != nil { return err } diff --git a/api_multimember.go b/api_multimember.go index 0b8dd89b..03003b40 100644 --- a/api_multimember.go +++ b/api_multimember.go @@ -12,7 +12,7 @@ import ( ) // MultiMemberGroupCreate creates a new MultiMember group -func (s *service) MultiMemberGroupCreate(ctx context.Context, req *protocoltypes.MultiMemberGroupCreate_Request) (_ *protocoltypes.MultiMemberGroupCreate_Reply, err error) { +func (s *service) MultiMemberGroupCreate(ctx context.Context, _ *protocoltypes.MultiMemberGroupCreate_Request) (_ *protocoltypes.MultiMemberGroupCreate_Reply, err error) { ctx, _, endSection := tyber.Section(ctx, s.logger, "Creating MultiMember group") defer func() { endSection(err, "") }() @@ -120,7 +120,7 @@ func (s *service) MultiMemberGroupAdminRoleGrant(context.Context, *protocoltypes } // MultiMemberGroupInvitationCreate creates a group invitation -func (s *service) MultiMemberGroupInvitationCreate(ctx context.Context, req *protocoltypes.MultiMemberGroupInvitationCreate_Request) (*protocoltypes.MultiMemberGroupInvitationCreate_Reply, error) { +func (s *service) MultiMemberGroupInvitationCreate(_ context.Context, req *protocoltypes.MultiMemberGroupInvitationCreate_Request) (*protocoltypes.MultiMemberGroupInvitationCreate_Reply, error) { cg, err := s.GetContextGroupForID(req.GroupPk) if err != nil { return nil, errcode.ErrCode_ErrGroupMemberUnknownGroupID.Wrap(err) diff --git a/api_replication.go b/api_replication.go index 7b8e038e..441dda3b 100644 --- a/api_replication.go +++ b/api_replication.go @@ -87,7 +87,7 @@ func (s *service) ReplicationServiceRegisterGroup(ctx context.Context, request * gopts = append(gopts, grpc.WithTransportCredentials(tlsconfig)) } - cc, err := grpc.DialContext(context.Background(), request.ReplicationServer, gopts...) + cc, err := grpc.NewClient("passthrough://"+request.ReplicationServer, gopts...) if err != nil { return nil, errcode.ErrCode_ErrStreamWrite.Wrap(err) } diff --git a/contact_request_manager.go b/contact_request_manager.go index 0b34e190..3be1e1de 100644 --- a/contact_request_manager.go +++ b/contact_request_manager.go @@ -115,7 +115,7 @@ func (c *contactRequestsManager) metadataWatcher(ctx context.Context) { } // subscribe to new event - sub, err := c.metadataStore.EventBus().Subscribe(new(protocoltypes.GroupMetadataEvent), + sub, err := c.metadataStore.EventBus().Subscribe(new(*protocoltypes.GroupMetadataEvent), eventbus.Name("weshnet/rqmngr/metadata-watcher")) if err != nil { c.logger.Warn("unable to subscribe to group metadata event", zap.Error(err)) @@ -153,7 +153,7 @@ func (c *contactRequestsManager) metadataWatcher(ctx context.Context) { } // handle new events - e := evt.(protocoltypes.GroupMetadataEvent) + e := evt.(*protocoltypes.GroupMetadataEvent) typ := e.GetMetadata().GetEventType() hctx, _, endSection := tyber.Section(ctx, c.logger, fmt.Sprintf("handling event - %s", typ.String())) @@ -161,7 +161,7 @@ func (c *contactRequestsManager) metadataWatcher(ctx context.Context) { var err error if handler, ok := handlers[typ]; ok { - if err = handler(hctx, &e); err != nil { + if err = handler(hctx, e); err != nil { c.logger.Error("metadata store event handler", zap.String("event", typ.String()), zap.Error(err)) } } @@ -421,7 +421,7 @@ func (c *contactRequestsManager) SendContactRequest(ctx context.Context, to *pro _, own := c.metadataStore.GetIncomingContactRequestsStatus() if own == nil { err = fmt.Errorf("unable to retrieve own contact information") - return + return err } // get own metadata for contact @@ -438,7 +438,7 @@ func (c *contactRequestsManager) SendContactRequest(ctx context.Context, to *pro } // create a new stream with the remote peer - stream, err := c.ipfs.NewStream(network.WithUseTransient(ctx, "req_mngr"), peer.ID, contactRequestV1) + stream, err := c.ipfs.NewStream(network.WithAllowLimitedConn(ctx, "req_mngr"), peer.ID, contactRequestV1) if err != nil { return fmt.Errorf("unable to open stream: %w", err) } diff --git a/events_sig_checkers.go b/events_sig_checkers.go index f2a13dfa..eca58ce3 100644 --- a/events_sig_checkers.go +++ b/events_sig_checkers.go @@ -10,7 +10,7 @@ import ( type sigChecker func(g *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, message proto.Message) error -func sigCheckerGroupSigned(g *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, message proto.Message) error { +func sigCheckerGroupSigned(g *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, _ proto.Message) error { pk, err := g.GetPubKey() if err != nil { return err @@ -33,7 +33,7 @@ type eventDeviceSigned interface { GetDevicePk() []byte } -func sigCheckerDeviceSigned(g *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, message proto.Message) error { +func sigCheckerDeviceSigned(_ *protocoltypes.Group, metadata *protocoltypes.GroupMetadata, message proto.Message) error { msg, ok := message.(eventDeviceSigned) if !ok { return errcode.ErrCode_ErrDeserialization diff --git a/group_context.go b/group_context.go index f151b2c9..a6535fa9 100644 --- a/group_context.go +++ b/group_context.go @@ -113,7 +113,7 @@ func (gc *GroupContext) ActivateGroupContext(contactPK crypto.PubKey) (err error // chainkey of new members. { m := gc.MetadataStore() - sub, err := m.EventBus().Subscribe(new(protocoltypes.GroupMetadataEvent)) + sub, err := m.EventBus().Subscribe(new(*protocoltypes.GroupMetadataEvent)) if err != nil { return fmt.Errorf("unable to subscribe to group metadata event: %w", err) } @@ -132,9 +132,9 @@ func (gc *GroupContext) ActivateGroupContext(contactPK crypto.PubKey) (err error } // @TODO(gfanton): should we handle this in a sub gorouting ? - e := evt.(protocoltypes.GroupMetadataEvent) + e := evt.(*protocoltypes.GroupMetadataEvent) // start := time.Now() - if err := gc.handleGroupMetadataEvent(&e); err != nil { + if err := gc.handleGroupMetadataEvent(e); err != nil { gc.logger.Error("unable to handle EventTypeGroupDeviceSecretAdded", zap.Error(err)) } diff --git a/internal/queue/metrics.go b/internal/queue/metrics.go index 9bbd6fee..6bb5d11a 100644 --- a/internal/queue/metrics.go +++ b/internal/queue/metrics.go @@ -9,5 +9,8 @@ var _ MetricsTracer[any] = (*noopTracer[any])(nil) type noopTracer[T any] struct{} +// nolint:revive func (*noopTracer[T]) ItemQueued(name string, item T) {} -func (*noopTracer[T]) ItemPop(name string, item T) {} + +// nolint:revive +func (*noopTracer[T]) ItemPop(name string, item T) {} diff --git a/orbitdb_datastore_cache.go b/orbitdb_datastore_cache.go index a5fd79ed..175a8c56 100644 --- a/orbitdb_datastore_cache.go +++ b/orbitdb_datastore_cache.go @@ -15,6 +15,7 @@ type datastoreCache struct { ds datastore.Batching } +//nolint:revive func (d *datastoreCache) Load(directory string, dbAddress address.Address) (datastore.Datastore, error) { return datastoreutil.NewNamespacedDatastore(d.ds, datastore.NewKey(dbAddress.String())), nil } @@ -23,6 +24,7 @@ func (d *datastoreCache) Close() error { return nil } +//nolint:revive func (d *datastoreCache) Destroy(directory string, dbAddress address.Address) error { keys, err := datastoreutil.NewNamespacedDatastore(d.ds, datastore.NewKey(dbAddress.String())).Query(context.TODO(), query.Query{KeysOnly: true}) if err != nil { diff --git a/orbitdb_many_adds_berty_test.go b/orbitdb_many_adds_berty_test.go index 236ea317..768e67d0 100644 --- a/orbitdb_many_adds_berty_test.go +++ b/orbitdb_many_adds_berty_test.go @@ -76,7 +76,7 @@ func testAddBerty(ctx context.Context, t *testing.T, node ipfsutil.CoreAPIMock, amountCurrentlyFound++ } - sub, err := gc.MessageStore().EventBus().Subscribe(new(protocoltypes.GroupMessageEvent)) + sub, err := gc.MessageStore().EventBus().Subscribe(new(*protocoltypes.GroupMessageEvent)) require.NoError(t, err) defer sub.Close() diff --git a/orbitdb_signed_entry_accesscontroller.go b/orbitdb_signed_entry_accesscontroller.go index 08a3a70b..ea9eb52e 100644 --- a/orbitdb_signed_entry_accesscontroller.go +++ b/orbitdb_signed_entry_accesscontroller.go @@ -37,14 +37,17 @@ func (o *simpleAccessController) Logger() *zap.Logger { return o.logger } +//nolint:revive func (o *simpleAccessController) Grant(ctx context.Context, capability string, keyID string) error { return nil } +//nolint:revive func (o *simpleAccessController) Revoke(ctx context.Context, capability string, keyID string) error { return nil } +//nolint:revive func (o *simpleAccessController) Load(ctx context.Context, address string) error { return nil } @@ -68,7 +71,7 @@ func simpleAccessControllerCID(allowedKeys map[string][]string) (cid.Cid, error) return c, nil } -func (o *simpleAccessController) Save(ctx context.Context) (accesscontroller.ManifestParams, error) { +func (o *simpleAccessController) Save(context.Context) (accesscontroller.ManifestParams, error) { c, err := simpleAccessControllerCID(o.allowedKeys) if err != nil { return nil, errcode.ErrCode_ErrInvalidInput.Wrap(err) @@ -89,7 +92,7 @@ func (o *simpleAccessController) GetAuthorizedByRole(role string) ([]string, err return o.allowedKeys[role], nil } -func (o *simpleAccessController) CanAppend(e logac.LogEntry, p identityprovider.Interface, additionalContext accesscontroller.CanAppendAdditionalContext) error { +func (o *simpleAccessController) CanAppend(e logac.LogEntry, _ identityprovider.Interface, _ accesscontroller.CanAppendAdditionalContext) error { for _, id := range o.allowedKeys["write"] { if e.GetIdentity().ID == id || id == "*" { return nil diff --git a/orbitdb_signed_entry_identity_provider.go b/orbitdb_signed_entry_identity_provider.go index ad0cd10c..8f276552 100644 --- a/orbitdb_signed_entry_identity_provider.go +++ b/orbitdb_signed_entry_identity_provider.go @@ -23,10 +23,11 @@ func (b *bertySignedIdentityProvider) UnmarshalPublicKey(data []byte) (crypto.Pu return crypto.UnmarshalPublicKey(data) } -func (b *bertySignedIdentityProvider) GetID(ctx context.Context, opts *identityprovider.CreateIdentityOptions) (string, error) { +func (b *bertySignedIdentityProvider) GetID(_ context.Context, opts *identityprovider.CreateIdentityOptions) (string, error) { return opts.ID, nil } +//nolint:revive func (b *bertySignedIdentityProvider) SignIdentity(ctx context.Context, data []byte, id string) ([]byte, error) { return nil, nil } @@ -35,7 +36,7 @@ func (b *bertySignedIdentityProvider) GetType() string { return identityType } -func (b *bertySignedIdentityProvider) VerifyIdentity(identity *identityprovider.Identity) error { +func (b *bertySignedIdentityProvider) VerifyIdentity(*identityprovider.Identity) error { return nil } diff --git a/orbitdb_signed_entry_keystore.go b/orbitdb_signed_entry_keystore.go index b6855a6c..0fc2eebf 100644 --- a/orbitdb_signed_entry_keystore.go +++ b/orbitdb_signed_entry_keystore.go @@ -28,7 +28,7 @@ func (s *BertySignedKeyStore) SetKey(pk crypto.PrivKey) error { return nil } -func (s *BertySignedKeyStore) HasKey(ctx context.Context, id string) (bool, error) { +func (s *BertySignedKeyStore) HasKey(_ context.Context, id string) (bool, error) { _, ok := s.Load(id) return ok, nil @@ -38,7 +38,7 @@ func (s *BertySignedKeyStore) CreateKey(ctx context.Context, id string) (crypto. return s.GetKey(ctx, id) } -func (s *BertySignedKeyStore) GetKey(ctx context.Context, id string) (crypto.PrivKey, error) { +func (s *BertySignedKeyStore) GetKey(_ context.Context, id string) (crypto.PrivKey, error) { if privKey, ok := s.Load(id); ok { if pk, ok := privKey.(crypto.PrivKey); ok { return pk, nil diff --git a/orbitdb_utils_test.go b/orbitdb_utils_test.go index 1c58e8ab..25577c9b 100644 --- a/orbitdb_utils_test.go +++ b/orbitdb_utils_test.go @@ -21,7 +21,7 @@ func inviteAllPeersToGroup(ctx context.Context, t *testing.T, peers []*mockedPee errChan := make(chan error, len(peers)) for i, p := range peers { - sub, err := p.GC.MetadataStore().EventBus().Subscribe(new(protocoltypes.GroupMetadataEvent)) + sub, err := p.GC.MetadataStore().EventBus().Subscribe(new(*protocoltypes.GroupMetadataEvent)) require.NoError(t, err) go func(p *mockedPeer, peerIndex int) { defer sub.Close() @@ -30,7 +30,7 @@ func inviteAllPeersToGroup(ctx context.Context, t *testing.T, peers []*mockedPee eventReceived := 0 for e := range sub.Out() { - evt := e.(protocoltypes.GroupMetadataEvent) + evt := e.(*protocoltypes.GroupMetadataEvent) if evt.Metadata.EventType != protocoltypes.EventType_EventTypeGroupMemberDeviceAdded { continue } @@ -76,7 +76,7 @@ func waitForBertyEventType(ctx context.Context, t *testing.T, ms *MetadataStore, handledEvents := map[string]struct{}{} - sub, err := ms.EventBus().Subscribe(new(protocoltypes.GroupMetadataEvent)) + sub, err := ms.EventBus().Subscribe(new(*protocoltypes.GroupMetadataEvent)) require.NoError(t, err) defer sub.Close() @@ -90,7 +90,7 @@ func waitForBertyEventType(ctx context.Context, t *testing.T, ms *MetadataStore, } switch evt := e.(type) { - case protocoltypes.GroupMetadataEvent: + case *protocoltypes.GroupMetadataEvent: if evt.Metadata.EventType != eventType { continue } diff --git a/pkg/bertyvcissuer/verifiable_public_key_fetcher.go b/pkg/bertyvcissuer/verifiable_public_key_fetcher.go index ad4d5d11..6c996a60 100644 --- a/pkg/bertyvcissuer/verifiable_public_key_fetcher.go +++ b/pkg/bertyvcissuer/verifiable_public_key_fetcher.go @@ -47,10 +47,12 @@ func embeddedPublicKeyFetcher(issuerID string, allowList []string) (*verifier.Pu }, nil } +// nolint:revive func EmbeddedPublicKeyFetcher(issuerID, keyID string) (*verifier.PublicKey, error) { return embeddedPublicKeyFetcher(issuerID, nil) } +// nolint:revive func EmbeddedPublicKeyFetcherAllowList(allowList []string) func(issuerID, keyID string) (*verifier.PublicKey, error) { return func(issuerID, keyID string) (*verifier.PublicKey, error) { return embeddedPublicKeyFetcher(issuerID, allowList) diff --git a/pkg/errcode/error.go b/pkg/errcode/error.go index 963636d4..d8f5818f 100644 --- a/pkg/errcode/error.go +++ b/pkg/errcode/error.go @@ -271,7 +271,7 @@ func codesFromGRPCStatus(st *status.Status) []ErrCode { return nil } -func grpcCodeFromWithCode(err WithCode) codes.Code { +func grpcCodeFromWithCode(WithCode) codes.Code { // here, we can do a big switch case if we plan to make accurate gRPC codes // but we probably don't care return codes.Unavailable diff --git a/pkg/grpcutil/buf_listener.go b/pkg/grpcutil/buf_listener.go index 44ffbff8..597feda9 100644 --- a/pkg/grpcutil/buf_listener.go +++ b/pkg/grpcutil/buf_listener.go @@ -23,11 +23,11 @@ func (bl *BufListener) dialer(context.Context, string) (net.Conn, error) { return bl.Dial() } -func (bl *BufListener) NewClientConn(ctx context.Context, opts ...grpc.DialOption) (*grpc.ClientConn, error) { +func (bl *BufListener) NewClientConn(_ context.Context, opts ...grpc.DialOption) (*grpc.ClientConn, error) { mendatoryOpts := []grpc.DialOption{ grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(bl.dialer), // set pipe dialer } - return grpc.DialContext(ctx, "buf", append(opts, mendatoryOpts...)...) + return grpc.NewClient("passthrough://buf", append(opts, mendatoryOpts...)...) } diff --git a/pkg/grpcutil/simple_auth.go b/pkg/grpcutil/simple_auth.go index 650cd9d4..9e9e26f0 100644 --- a/pkg/grpcutil/simple_auth.go +++ b/pkg/grpcutil/simple_auth.go @@ -21,7 +21,8 @@ func NewUnsecureSimpleAuthAccess(scheme, token string) credentials.PerRPCCredent return &unsecureSimpleAuthAccess{token: token, scheme: scheme} } -func (sa *unsecureSimpleAuthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) { +// nolint:revive +func (sa *unsecureSimpleAuthAccess) GetRequestMetadata(_ context.Context, uri ...string) (map[string]string, error) { return map[string]string{ headerAuthorize: "bearer " + sa.token, }, nil diff --git a/pkg/ipfsutil/collector_host.go b/pkg/ipfsutil/collector_host.go index 0de58577..7b71061b 100644 --- a/pkg/ipfsutil/collector_host.go +++ b/pkg/ipfsutil/collector_host.go @@ -79,16 +79,16 @@ func (cc *HostCollector) Describe(ch chan<- *prometheus.Desc) { func (cc *HostCollector) Listen(network.Network, ma.Multiaddr) {} func (cc *HostCollector) ListenClose(network.Network, ma.Multiaddr) {} -func (cc *HostCollector) Connected(n network.Network, c network.Conn) { +func (cc *HostCollector) Connected(network.Network, network.Conn) { cc.connsCollector.Inc() } -func (cc *HostCollector) Disconnected(n network.Network, c network.Conn) { +func (cc *HostCollector) Disconnected(network.Network, network.Conn) { cc.connsCollector.Dec() } -func (cc *HostCollector) OpenedStream(n network.Network, s network.Stream) {} -func (cc *HostCollector) ClosedStream(n network.Network, s network.Stream) { +func (cc *HostCollector) OpenedStream(network.Network, network.Stream) {} +func (cc *HostCollector) ClosedStream(network.Network, network.Stream) { // elpased := time.Since(s.Stat().Opened) // cc.streamsCollector.WithLabelValues(string(s.Protocol())).Observe(elpased.Seconds()) } diff --git a/pkg/ipfsutil/conn_logger.go b/pkg/ipfsutil/conn_logger.go index 01a77633..c0a7e566 100644 --- a/pkg/ipfsutil/conn_logger.go +++ b/pkg/ipfsutil/conn_logger.go @@ -55,15 +55,15 @@ func (cl *connLogger) getPeerTags(p peer.ID) []string { return nil } -func (cl *connLogger) Listen(n network.Network, m ma.Multiaddr) { +func (cl *connLogger) Listen(_ network.Network, m ma.Multiaddr) { cl.logger.Debug("Listener opened", logutil.PrivateString("Multiaddr", m.String())) } -func (cl *connLogger) ListenClose(n network.Network, m ma.Multiaddr) { +func (cl *connLogger) ListenClose(_ network.Network, m ma.Multiaddr) { cl.logger.Debug("Listener closed", logutil.PrivateString("Multiaddr", m.String())) } -func (cl *connLogger) Connected(net network.Network, c network.Conn) { +func (cl *connLogger) Connected(_ network.Network, c network.Conn) { // Wait 10 ms until the peer has been tagged by orbit-db go func() { <-time.After(10 * time.Millisecond) @@ -78,7 +78,7 @@ func (cl *connLogger) Connected(net network.Network, c network.Conn) { }() } -func (cl *connLogger) Disconnected(n network.Network, c network.Conn) { +func (cl *connLogger) Disconnected(_ network.Network, c network.Conn) { if tags := cl.getPeerTags(c.RemotePeer()); tags != nil { cl.logger.Info("Disconnected", logutil.PrivateString("peer", c.RemotePeer().String()), @@ -89,7 +89,7 @@ func (cl *connLogger) Disconnected(n network.Network, c network.Conn) { } } -func (cl *connLogger) OpenedStream(n network.Network, s network.Stream) { +func (cl *connLogger) OpenedStream(_ network.Network, s network.Stream) { if tags := cl.getPeerTags(s.Conn().RemotePeer()); tags != nil { cl.logger.Debug("Stream opened", logutil.PrivateString("peer", s.Conn().RemotePeer().String()), @@ -101,7 +101,7 @@ func (cl *connLogger) OpenedStream(n network.Network, s network.Stream) { } } -func (cl *connLogger) ClosedStream(n network.Network, s network.Stream) { +func (cl *connLogger) ClosedStream(_ network.Network, s network.Stream) { if tags := cl.getPeerTags(s.Conn().RemotePeer()); tags != nil { cl.logger.Debug("Stream closed", logutil.PrivateString("peer", s.Conn().RemotePeer().String()), diff --git a/pkg/ipfsutil/conn_manager.go b/pkg/ipfsutil/conn_manager.go index e5e2c88b..cdb1bd8d 100644 --- a/pkg/ipfsutil/conn_manager.go +++ b/pkg/ipfsutil/conn_manager.go @@ -130,13 +130,13 @@ func (c *BertyConnManager) UpsertTag(p peer.ID, tag string, upsert func(int) int } } -func (c *BertyConnManager) computePeerScore(p peer.ID) (old, new int) { +func (c *BertyConnManager) computePeerScore(p peer.ID) (old, newScore int) { c.muMarked.Lock() old = c.marked[p] if info := c.ConnManager.GetTagInfo(p); info != nil { - if new = info.Value; new > 0 { - c.marked[p] = new + if newScore = info.Value; newScore > 0 { + c.marked[p] = newScore } else { delete(c.marked, p) } diff --git a/pkg/ipfsutil/localrecord.go b/pkg/ipfsutil/localrecord.go index 1d520993..7955676d 100644 --- a/pkg/ipfsutil/localrecord.go +++ b/pkg/ipfsutil/localrecord.go @@ -23,7 +23,7 @@ type LocalRecord struct { } // OptionLocalRecord is given to CoreAPIOption.Options when the ipfs node setup -func OptionLocalRecord(node *ipfs_core.IpfsNode, api coreiface.CoreAPI) error { +func OptionLocalRecord(node *ipfs_core.IpfsNode, _ coreiface.CoreAPI) error { lr := &LocalRecord{ host: node.PeerHost, } @@ -40,7 +40,7 @@ func (lr *LocalRecord) Listen(network.Network, ma.Multiaddr) {} func (lr *LocalRecord) ListenClose(network.Network, ma.Multiaddr) {} // called when a connection opened -func (lr *LocalRecord) Connected(net network.Network, c network.Conn) { +func (lr *LocalRecord) Connected(_ network.Network, c network.Conn) { ctx := context.Background() // FIXME: since go-libp2p-core@0.8.0 adds support for passed context on new call, we should think if we have a better context to pass here go func() { if manet.IsPrivateAddr(c.RemoteMultiaddr()) || mafmt.Base(mc.ProtocolCode).Matches(c.RemoteMultiaddr()) { @@ -68,6 +68,6 @@ func (lr *LocalRecord) sendLocalRecord(ctx context.Context, c network.Conn) erro return s.SetProtocol(recProtocolID) } -func (lr *LocalRecord) handleLocalRecords(s network.Stream) { +func (lr *LocalRecord) handleLocalRecords(network.Stream) { os.Stderr.WriteString("handleLocalRecords") } diff --git a/pkg/ipfsutil/pubsub_api.go b/pkg/ipfsutil/pubsub_api.go index 422bba86..e19c4542 100644 --- a/pkg/ipfsutil/pubsub_api.go +++ b/pkg/ipfsutil/pubsub_api.go @@ -21,7 +21,7 @@ type PubSubAPI struct { topics map[string]*p2p_pubsub.Topic } -func NewPubSubAPI(ctx context.Context, logger *zap.Logger, ps *p2p_pubsub.PubSub) coreiface.PubSubAPI { +func NewPubSubAPI(_ context.Context, logger *zap.Logger, ps *p2p_pubsub.PubSub) coreiface.PubSubAPI { return &PubSubAPI{ PubSub: ps, @@ -65,12 +65,12 @@ func (ps *PubSubAPI) topicJoin(topic string, opts ...p2p_pubsub.TopicOpt) (*p2p_ // } // Ls lists subscribed topics by name -func (ps *PubSubAPI) Ls(ctx context.Context) ([]string, error) { +func (ps *PubSubAPI) Ls(context.Context) ([]string, error) { return ps.PubSub.GetTopics(), nil } // Peers list peers we are currently pubsubbing with -func (ps *PubSubAPI) Peers(ctx context.Context, opts ...coreiface_options.PubSubPeersOption) ([]p2p_peer.ID, error) { +func (ps *PubSubAPI) Peers(_ context.Context, opts ...coreiface_options.PubSubPeersOption) ([]p2p_peer.ID, error) { s, err := coreiface_options.PubSubPeersOptions(opts...) if err != nil { return nil, err @@ -92,7 +92,7 @@ func (ps *PubSubAPI) Publish(ctx context.Context, topic string, msg []byte) erro } // Subscribe to messages on a given topic -func (ps *PubSubAPI) Subscribe(ctx context.Context, topic string, opts ...coreiface_options.PubSubSubscribeOption) (coreiface.PubSubSubscription, error) { +func (ps *PubSubAPI) Subscribe(_ context.Context, topic string, _ ...coreiface_options.PubSubSubscribeOption) (coreiface.PubSubSubscription, error) { t, err := ps.topicJoin(topic) if err != nil { return nil, err diff --git a/pkg/logutil/logger_native.go b/pkg/logutil/logger_native.go index f4473762..2707e068 100644 --- a/pkg/logutil/logger_native.go +++ b/pkg/logutil/logger_native.go @@ -16,11 +16,11 @@ func NewNativeDriverCore(subsystem string, enc zapcore.Encoder) zapcore.Core { return &nativeCore{subsystem: subsystem, enc: enc} } -func (nc *nativeCore) Enabled(level zapcore.Level) bool { +func (nc *nativeCore) Enabled(zapcore.Level) bool { return true } -func (nc *nativeCore) With(fields []zapcore.Field) zapcore.Core { +func (nc *nativeCore) With([]zapcore.Field) zapcore.Core { return &nativeCore{enc: nc.enc} } diff --git a/pkg/protoio/full.go b/pkg/protoio/full.go index 05c26194..d7595d09 100644 --- a/pkg/protoio/full.go +++ b/pkg/protoio/full.go @@ -43,7 +43,7 @@ type fullWriter struct { buffer []byte } -func (this *fullWriter) WriteMsg(msg proto.Message) (err error) { +func (writer *fullWriter) WriteMsg(msg proto.Message) (err error) { var data []byte if m, ok := msg.(marshaler); ok { n, ok := getSize(m) @@ -53,26 +53,26 @@ func (this *fullWriter) WriteMsg(msg proto.Message) (err error) { return err } } - if n >= len(this.buffer) { - this.buffer = make([]byte, n) + if n >= len(writer.buffer) { + writer.buffer = make([]byte, n) } - _, err = m.MarshalTo(this.buffer) + _, err = m.MarshalTo(writer.buffer) if err != nil { return err } - data = this.buffer[:n] + data = writer.buffer[:n] } else { data, err = proto.Marshal(msg) if err != nil { return err } } - _, err = this.w.Write(data) + _, err = writer.w.Write(data) return err } -func (this *fullWriter) Close() error { - if closer, ok := this.w.(io.Closer); ok { +func (writer *fullWriter) Close() error { + if closer, ok := writer.w.(io.Closer); ok { return closer.Close() } return nil @@ -87,16 +87,16 @@ func NewFullReader(r io.Reader, maxSize int) ReadCloser { return &fullReader{r, make([]byte, maxSize)} } -func (this *fullReader) ReadMsg(msg proto.Message) error { - length, err := this.r.Read(this.buf) +func (reader *fullReader) ReadMsg(msg proto.Message) error { + length, err := reader.r.Read(reader.buf) if err != nil { return err } - return proto.Unmarshal(this.buf[:length], msg) + return proto.Unmarshal(reader.buf[:length], msg) } -func (this *fullReader) Close() error { - if closer, ok := this.r.(io.Closer); ok { +func (reader *fullReader) Close() error { + if closer, ok := reader.r.(io.Closer); ok { return closer.Close() } return nil diff --git a/pkg/protoio/io.go b/pkg/protoio/io.go index 4bf80422..c1a673bb 100644 --- a/pkg/protoio/io.go +++ b/pkg/protoio/io.go @@ -65,7 +65,7 @@ func getSize(v interface{}) (int, bool) { ProtoSize() (n int) }); ok { return sz.ProtoSize(), true - } else { - return 0, false } + + return 0, false } diff --git a/pkg/protoio/uint32.go b/pkg/protoio/uint32.go index 160dcdfc..b701e84a 100644 --- a/pkg/protoio/uint32.go +++ b/pkg/protoio/uint32.go @@ -52,48 +52,48 @@ type uint32Writer struct { lenBuf []byte } -func (this *uint32Writer) writeFallback(msg proto.Message) error { +func (writer *uint32Writer) writeFallback(msg proto.Message) error { data, err := proto.Marshal(msg) if err != nil { return err } length := uint32(len(data)) - this.byteOrder.PutUint32(this.lenBuf, length) - if _, err = this.w.Write(this.lenBuf); err != nil { + writer.byteOrder.PutUint32(writer.lenBuf, length) + if _, err = writer.w.Write(writer.lenBuf); err != nil { return err } - _, err = this.w.Write(data) + _, err = writer.w.Write(data) return err } -func (this *uint32Writer) WriteMsg(msg proto.Message) error { +func (writer *uint32Writer) WriteMsg(msg proto.Message) error { m, ok := msg.(marshaler) if !ok { - return this.writeFallback(msg) + return writer.writeFallback(msg) } n, ok := getSize(m) if !ok { - return this.writeFallback(msg) + return writer.writeFallback(msg) } size := n + uint32BinaryLen - if size > len(this.buffer) { - this.buffer = make([]byte, size) + if size > len(writer.buffer) { + writer.buffer = make([]byte, size) } - this.byteOrder.PutUint32(this.buffer, uint32(n)) - if _, err := m.MarshalTo(this.buffer[uint32BinaryLen:]); err != nil { + writer.byteOrder.PutUint32(writer.buffer, uint32(n)) + if _, err := m.MarshalTo(writer.buffer[uint32BinaryLen:]); err != nil { return err } - _, err := this.w.Write(this.buffer[:size]) + _, err := writer.w.Write(writer.buffer[:size]) return err } -func (this *uint32Writer) Close() error { - if closer, ok := this.w.(io.Closer); ok { +func (writer *uint32Writer) Close() error { + if closer, ok := writer.w.(io.Closer); ok { return closer.Close() } return nil @@ -111,27 +111,27 @@ func NewUint32DelimitedReader(r io.Reader, byteOrder binary.ByteOrder, maxSize i return &uint32Reader{r, byteOrder, make([]byte, 4), nil, maxSize} } -func (this *uint32Reader) ReadMsg(msg proto.Message) error { - if _, err := io.ReadFull(this.r, this.lenBuf); err != nil { +func (reader *uint32Reader) ReadMsg(msg proto.Message) error { + if _, err := io.ReadFull(reader.r, reader.lenBuf); err != nil { return err } - length32 := this.byteOrder.Uint32(this.lenBuf) + length32 := reader.byteOrder.Uint32(reader.lenBuf) length := int(length32) - if length < 0 || length > this.maxSize { + if length < 0 || length > reader.maxSize { return io.ErrShortBuffer } - if length > len(this.buf) { - this.buf = make([]byte, length) + if length > len(reader.buf) { + reader.buf = make([]byte, length) } - _, err := io.ReadFull(this.r, this.buf[:length]) + _, err := io.ReadFull(reader.r, reader.buf[:length]) if err != nil { return err } - return proto.Unmarshal(this.buf[:length], msg) + return proto.Unmarshal(reader.buf[:length], msg) } -func (this *uint32Reader) Close() error { - if closer, ok := this.r.(io.Closer); ok { +func (reader *uint32Reader) Close() error { + if closer, ok := reader.r.(io.Closer); ok { return closer.Close() } return nil diff --git a/pkg/protoio/varint.go b/pkg/protoio/varint.go index 63e85122..f30d8ef8 100644 --- a/pkg/protoio/varint.go +++ b/pkg/protoio/varint.go @@ -46,20 +46,20 @@ type varintWriter struct { buffer []byte } -func (this *varintWriter) WriteMsg(msg proto.Message) (err error) { +func (writer *varintWriter) WriteMsg(msg proto.Message) (err error) { var data []byte if m, ok := msg.(marshaler); ok { n, ok := getSize(m) if ok { - if n+binary.MaxVarintLen64 >= len(this.buffer) { - this.buffer = make([]byte, n+binary.MaxVarintLen64) + if n+binary.MaxVarintLen64 >= len(writer.buffer) { + writer.buffer = make([]byte, n+binary.MaxVarintLen64) } - lenOff := binary.PutUvarint(this.buffer, uint64(n)) - _, err = m.MarshalTo(this.buffer[lenOff:]) + lenOff := binary.PutUvarint(writer.buffer, uint64(n)) + _, err = m.MarshalTo(writer.buffer[lenOff:]) if err != nil { return err } - _, err = this.w.Write(this.buffer[:lenOff+n]) + _, err = writer.w.Write(writer.buffer[:lenOff+n]) return err } } @@ -70,17 +70,17 @@ func (this *varintWriter) WriteMsg(msg proto.Message) (err error) { return err } length := uint64(len(data)) - n := binary.PutUvarint(this.lenBuf, length) - _, err = this.w.Write(this.lenBuf[:n]) + n := binary.PutUvarint(writer.lenBuf, length) + _, err = writer.w.Write(writer.lenBuf[:n]) if err != nil { return err } - _, err = this.w.Write(data) + _, err = writer.w.Write(data) return err } -func (this *varintWriter) Close() error { - if closer, ok := this.w.(io.Closer); ok { +func (writer *varintWriter) Close() error { + if closer, ok := writer.w.(io.Closer); ok { return closer.Close() } return nil @@ -101,28 +101,28 @@ type varintReader struct { closer io.Closer } -func (this *varintReader) ReadMsg(msg proto.Message) error { - length64, err := binary.ReadUvarint(this.r) +func (reader *varintReader) ReadMsg(msg proto.Message) error { + length64, err := binary.ReadUvarint(reader.r) if err != nil { return err } length := int(length64) - if length < 0 || length > this.maxSize { + if length < 0 || length > reader.maxSize { return io.ErrShortBuffer } - if len(this.buf) < length { - this.buf = make([]byte, length) + if len(reader.buf) < length { + reader.buf = make([]byte, length) } - buf := this.buf[:length] - if _, err := io.ReadFull(this.r, buf); err != nil { + buf := reader.buf[:length] + if _, err := io.ReadFull(reader.r, buf); err != nil { return err } return proto.Unmarshal(buf, msg) } -func (this *varintReader) Close() error { - if this.closer != nil { - return this.closer.Close() +func (reader *varintReader) Close() error { + if reader.closer != nil { + return reader.closer.Close() } return nil } diff --git a/pkg/proximitytransport/conn.go b/pkg/proximitytransport/conn.go index b14b7cfd..60064ca9 100644 --- a/pkg/proximitytransport/conn.go +++ b/pkg/proximitytransport/conn.go @@ -191,10 +191,10 @@ func (c *Conn) RemoteMultiaddr() ma.Multiaddr { return c.remoteMa } // Noop deadline methods, handled by the native driver. // SetDeadline does nothing -func (c *Conn) SetDeadline(t time.Time) error { return nil } +func (c *Conn) SetDeadline(time.Time) error { return nil } // SetReadDeadline does nothing -func (c *Conn) SetReadDeadline(t time.Time) error { return nil } +func (c *Conn) SetReadDeadline(time.Time) error { return nil } // SetWriteDeadline does nothing -func (c *Conn) SetWriteDeadline(t time.Time) error { return nil } +func (c *Conn) SetWriteDeadline(time.Time) error { return nil } diff --git a/pkg/rendezvous/emitterio_sync_client.go b/pkg/rendezvous/emitterio_sync_client.go index 0bfd7e36..ad9113e2 100644 --- a/pkg/rendezvous/emitterio_sync_client.go +++ b/pkg/rendezvous/emitterio_sync_client.go @@ -64,7 +64,7 @@ func (e *emitterClient) Close() (err error) { func (e *emitterClient) subscribeToServerUpdates(inChan chan *registrationMessage, psDetails *EmitterPubSubSubscriptionDetails) (err error) { e.logger.Debug("subscribing", zap.String("chan", psDetails.ChannelName)) - return e.client.Subscribe(psDetails.ReadKey, psDetails.ChannelName, func(client *emitter.Client, message emitter.Message) { + return e.client.Subscribe(psDetails.ReadKey, psDetails.ChannelName, func(_ *emitter.Client, message emitter.Message) { reg := &pb.RegistrationRecord{} e.logger.Debug("receiving a message", zap.Any("topic", message.Topic())) @@ -117,7 +117,7 @@ func (e *emitterClientManager) getClient(psDetails *EmitterPubSubSubscriptionDet return } - noophandler := func(client *emitter.Client, message emitter.Message) {} + noophandler := func(*emitter.Client, emitter.Message) {} cl, err := emitter.Connect(psDetails.ServerAddr, noophandler, emitter.WithLogger(e.logger.Named("cl"))) if err != nil { return diff --git a/pkg/rendezvous/emitterio_sync_provider.go b/pkg/rendezvous/emitterio_sync_provider.go index 22b7a725..9a2d786c 100644 --- a/pkg/rendezvous/emitterio_sync_provider.go +++ b/pkg/rendezvous/emitterio_sync_provider.go @@ -70,6 +70,7 @@ func NewEmitterServer(serverAddr string, adminKey string, options *EmitterOption return ps, nil } +// nolint:revive func (p *EmitterPubSub) Register(pid peer.ID, ns string, addrs [][]byte, ttlAsSeconds int, counter uint64) { p.logger.Debug("register", zap.String("pid", pid.String()), zap.String("ns", ns)) diff --git a/pkg/rendezvous/rotation.go b/pkg/rendezvous/rotation.go index 230d64e7..fc97ea0b 100644 --- a/pkg/rendezvous/rotation.go +++ b/pkg/rendezvous/rotation.go @@ -103,12 +103,12 @@ func (r *RotationInterval) registerPoint(point *Point) { } func (r *RotationInterval) rotate(old *Point, graceperiod time.Duration) *Point { - new := old.NextPoint() + newPoint := old.NextPoint() // register new point - r.registerPoint(new) + r.registerPoint(newPoint) - cleanuptime := time.Until(new.Deadline().Add(graceperiod)) + cleanuptime := time.Until(newPoint.Deadline().Add(graceperiod)) if cleanuptime < 0 { cleanuptime = 0 } @@ -120,7 +120,7 @@ func (r *RotationInterval) rotate(old *Point, graceperiod time.Duration) *Point r.muCache.Unlock() }) - return new + return newPoint } type Point struct { diff --git a/pkg/tinder/driver_localdiscovery.go b/pkg/tinder/driver_localdiscovery.go index a8eb86b3..892020f4 100644 --- a/pkg/tinder/driver_localdiscovery.go +++ b/pkg/tinder/driver_localdiscovery.go @@ -74,7 +74,7 @@ func newLinkedCache() *linkedCache { } } -func NewLocalDiscovery(logger *zap.Logger, host host.Host, rng *rand.Rand) (*LocalDiscovery, error) { +func NewLocalDiscovery(logger *zap.Logger, host host.Host, _ *rand.Rand) (*LocalDiscovery, error) { ctx, cancel := context.WithCancel(context.Background()) ld := &LocalDiscovery{ rootctx: ctx, @@ -140,7 +140,7 @@ func (ld *LocalDiscovery) Advertise(ctx context.Context, cid string, opts ...dis return ttl, nil } -func (ld *LocalDiscovery) FindPeers(ctx context.Context, cid string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) { +func (ld *LocalDiscovery) FindPeers(_ context.Context, cid string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) { // Get options var options discovery.Options err := options.Apply(opts...) @@ -283,7 +283,7 @@ func (ld *LocalDiscovery) getLocalReccord() *Records { return &Records{Records: records} } -func (ld *LocalDiscovery) Unregister(ctx context.Context, cid string, _ ...discovery.Option) error { +func (ld *LocalDiscovery) Unregister(_ context.Context, cid string, _ ...discovery.Option) error { ld.muRecs.Lock() delete(ld.recs, cid) ld.muRecs.Unlock() diff --git a/pkg/tinder/driver_mock.go b/pkg/tinder/driver_mock.go index d797cce9..4f7b14c6 100644 --- a/pkg/tinder/driver_mock.go +++ b/pkg/tinder/driver_mock.go @@ -77,7 +77,7 @@ func (s *MockDriverServer) Unregister(ctx context.Context, topic string, p peer. s.mx.Unlock() } -func (s *MockDriverServer) Exist(topic string, p peer.ID) (ok bool) { +func (s *MockDriverServer) Exist(topic string, _ peer.ID) (ok bool) { peers := s.pc.GetPeersForTopics(topic) return len(peers) == 1 } @@ -153,7 +153,7 @@ func (s *MockIDriverClient) Name() string { return "mock" } -func (s *MockIDriverClient) FindPeers(ctx context.Context, topic string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) { +func (s *MockIDriverClient) FindPeers(_ context.Context, topic string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) { var options discovery.Options err := options.Apply(opts...) if err != nil { @@ -167,7 +167,7 @@ func (s *MockIDriverClient) FindPeers(ctx context.Context, topic string, opts .. return s.serv.FindPeers(topic, options.Limit), nil } -func (s *MockIDriverClient) Advertise(ctx context.Context, topic string, opts ...discovery.Option) (time.Duration, error) { +func (s *MockIDriverClient) Advertise(_ context.Context, topic string, opts ...discovery.Option) (time.Duration, error) { var options discovery.Options err := options.Apply(opts...) if err != nil { @@ -201,7 +201,7 @@ func (s *MockIDriverClient) Subscribe(ctx context.Context, topic string, opts .. return out, nil } -func (s *MockIDriverClient) Unregister(ctx context.Context, topic string, opts ...discovery.Option) error { +func (s *MockIDriverClient) Unregister(ctx context.Context, topic string, _ ...discovery.Option) error { s.serv.Unregister(ctx, topic, s.h.ID()) return nil } diff --git a/pkg/tinder/driver_rdvp.go b/pkg/tinder/driver_rdvp.go index 179d7d00..75f5baf8 100644 --- a/pkg/tinder/driver_rdvp.go +++ b/pkg/tinder/driver_rdvp.go @@ -183,7 +183,7 @@ func (c *rendezvousDiscovery) Subscribe(ctx context.Context, topic string, _ ... return ch, err } -func (c *rendezvousDiscovery) Unregister(ctx context.Context, topic string, opts ...discovery.Option) error { +func (c *rendezvousDiscovery) Unregister(ctx context.Context, topic string, _ ...discovery.Option) error { c.peerCacheMux.RLock() cache, ok := c.peerCache[topic] if ok { diff --git a/pkg/tinder/notify_network.go b/pkg/tinder/notify_network.go index 9de8e032..4aba7113 100644 --- a/pkg/tinder/notify_network.go +++ b/pkg/tinder/notify_network.go @@ -63,7 +63,7 @@ func (n *NetworkUpdate) WaitForUpdate(ctx context.Context, currentAddrs []ma.Mul } } -func (n *NetworkUpdate) GetLastUpdatedAddrs(ctx context.Context) (addrs []ma.Multiaddr) { +func (n *NetworkUpdate) GetLastUpdatedAddrs(context.Context) (addrs []ma.Multiaddr) { n.locker.Lock() addrs = n.currentAddrs n.locker.Unlock() diff --git a/pkg/tinder/peer_cache.go b/pkg/tinder/peer_cache.go index 6af635c3..10e883ee 100644 --- a/pkg/tinder/peer_cache.go +++ b/pkg/tinder/peer_cache.go @@ -62,7 +62,7 @@ func (c *peersCache) UpdatePeer(topic string, p peer.AddrInfo) (isNew bool) { c.peers[p.ID] = *combined } else if exist { // we already know this peer, and no change have been provided - return + return isNew } } else { c.peers[p.ID] = p @@ -126,7 +126,7 @@ func (c *peersCache) WaitForPeerUpdate(ctx context.Context, topic string, curren return } -func (c *peersCache) RemoveFromCache(ctx context.Context, topic string, p peer.ID) (ok bool) { +func (c *peersCache) RemoveFromCache(_ context.Context, topic string, p peer.ID) (ok bool) { c.muCache.Lock() var tu *topicUpdate if tu, ok = c.topics[topic]; ok { diff --git a/pkg/tinder/service_adaptater.go b/pkg/tinder/service_adaptater.go index 3d91dc66..63231507 100644 --- a/pkg/tinder/service_adaptater.go +++ b/pkg/tinder/service_adaptater.go @@ -55,7 +55,7 @@ func NewDiscoveryAdaptater(logger *zap.Logger, service *Service, defaultOpts ... } } -func (a *DiscoveryAdaptater) FindPeers(ctx context.Context, topic string, opts ...discovery.Option) (<-chan peer.AddrInfo, error) { +func (a *DiscoveryAdaptater) FindPeers(_ context.Context, topic string, _ ...discovery.Option) (<-chan peer.AddrInfo, error) { a.muDiscover.Lock() defer a.muDiscover.Unlock() @@ -104,7 +104,7 @@ func (a *DiscoveryAdaptater) FindPeers(ctx context.Context, topic string, opts . return sub.Out(), nil } -func (a *DiscoveryAdaptater) Advertise(_ context.Context, topic string, opts ...discovery.Option) (time.Duration, error) { +func (a *DiscoveryAdaptater) Advertise(_ context.Context, topic string, _ ...discovery.Option) (time.Duration, error) { ctx := a.ctx a.muAdvertiser.Lock() diff --git a/pkg/tyber/format.go b/pkg/tyber/format.go index cba42952..ac54d0cb 100644 --- a/pkg/tyber/format.go +++ b/pkg/tyber/format.go @@ -85,7 +85,7 @@ func FormatTraceLogFields(ctx context.Context) []zapcore.Field { } } -func FormatEventLogFields(ctx context.Context, details []Detail) []zapcore.Field { +func FormatEventLogFields(_ context.Context, details []Detail) []zapcore.Field { return []zapcore.Field{ zap.String("tyberLogType", string(EventType)), zap.Any("event", Event{ diff --git a/store_message.go b/store_message.go index d69f4f35..a79c6ddb 100644 --- a/store_message.go +++ b/store_message.go @@ -192,7 +192,7 @@ func (m *MessageStore) processMessageLoop(ctx context.Context, tracer *messageMe m.processDeviceMessagesInQueue(device) // emit new message event - if err := m.emitters.groupMessage.Emit(*evt); err != nil { + if err := m.emitters.groupMessage.Emit(evt); err != nil { m.logger.Warn("unable to emit group message event", zap.Error(err)) } } @@ -415,7 +415,7 @@ func constructorFactoryGroupMessage(s *WeshOrbitDB, logger *zap.Logger) iface.St logger.Debug("store message process loop ended", zap.Error(store.ctx.Err())) }() - if store.emitters.groupMessage, err = store.eventBus.Emitter(new(protocoltypes.GroupMessageEvent)); err != nil { + if store.emitters.groupMessage, err = store.eventBus.Emitter(new(*protocoltypes.GroupMessageEvent)); err != nil { store.cancel() return nil, errcode.ErrCode_ErrOrbitDBInit.Wrap(err) } @@ -498,7 +498,7 @@ func (m *MessageStore) GetMessageByCID(c cid.Cid) (operation.Operation, error) { return op, nil } -func (m *MessageStore) GetOutOfStoreMessageEnvelope(ctx context.Context, c cid.Cid) (*protocoltypes.OutOfStoreMessageEnvelope, error) { +func (m *MessageStore) GetOutOfStoreMessageEnvelope(_ context.Context, c cid.Cid) (*protocoltypes.OutOfStoreMessageEnvelope, error) { op, err := m.GetMessageByCID(c) if err != nil { return nil, errcode.ErrCode_ErrInvalidInput.Wrap(err) diff --git a/store_message_test.go b/store_message_test.go index 96424280..ddab0703 100644 --- a/store_message_test.go +++ b/store_message_test.go @@ -60,7 +60,7 @@ func Test_AddMessage_ListMessages_manually_supplying_secrets(t *testing.T) { require.Equal(t, 1, countEntries(out)) watcherCtx, watcherCancel := context.WithTimeout(ctx, time.Second*5) - chSub, err := peers[1].GC.MessageStore().EventBus().Subscribe(new(protocoltypes.GroupMessageEvent)) + chSub, err := peers[1].GC.MessageStore().EventBus().Subscribe(new(*protocoltypes.GroupMessageEvent)) require.NoError(t, err) defer chSub.Close() @@ -141,7 +141,7 @@ func Test_Add_Messages_To_Cache(t *testing.T) { require.NotNil(t, ds0For1) cevent, err := peers[0].GC.MessageStore().EventBus().Subscribe( - new(protocoltypes.GroupMessageEvent), eventbus.BufSize(entriesCount)) + new(*protocoltypes.GroupMessageEvent), eventbus.BufSize(entriesCount)) require.NoError(t, err) cadded, err := peers[1].GC.MessageStore().EventBus().Subscribe( @@ -191,7 +191,7 @@ func Test_Add_Messages_To_Cache(t *testing.T) { require.NoError(t, err) cevent, err = peers[1].GC.MessageStore().EventBus().Subscribe( - new(protocoltypes.GroupMessageEvent), eventbus.BufSize(entriesCount)) + new(*protocoltypes.GroupMessageEvent), eventbus.BufSize(entriesCount)) require.NoError(t, err) peers[1].GC.MessageStore().ProcessMessageQueueForDevicePK(ctx, dPK0Raw) diff --git a/store_metadata.go b/store_metadata.go index 2c50c3b4..5beb595f 100644 --- a/store_metadata.go +++ b/store_metadata.go @@ -107,7 +107,7 @@ func openMetadataEntry(log ipfslog.Log, e ipfslog.Entry, g *protocoltypes.Group) // } // FIXME: use iterator instead to reduce resource usage (require go-ipfs-log improvements) -func (m *MetadataStore) ListEvents(ctx context.Context, since, until []byte, reverse bool) (<-chan *protocoltypes.GroupMetadataEvent, error) { +func (m *MetadataStore) ListEvents(_ context.Context, since, until []byte, reverse bool) (<-chan *protocoltypes.GroupMetadataEvent, error) { entries, err := getEntriesInRange(m.OpLog().GetEntries().Reverse().Slice(), since, until) if err != nil { return nil, err @@ -1008,7 +1008,7 @@ func constructorFactoryGroupMetadata(s *WeshOrbitDB, logger *zap.Logger) iface.S store.logger.Warn("unable to emit recv event", zap.Error(err)) } - if err := store.emitters.groupMetadata.Emit(*metaEvent); err != nil { + if err := store.emitters.groupMetadata.Emit(metaEvent); err != nil { store.logger.Warn("unable to emit group metadata event", zap.Error(err)) } } @@ -1030,7 +1030,7 @@ func (m *MetadataStore) initEmitter() (err error) { return } - if m.emitters.groupMetadata, err = m.eventBus.Emitter(new(protocoltypes.GroupMetadataEvent)); err != nil { + if m.emitters.groupMetadata, err = m.eventBus.Emitter(new(*protocoltypes.GroupMetadataEvent)); err != nil { return } diff --git a/store_metadata_index.go b/store_metadata_index.go index 7dce2754..5b03d733 100644 --- a/store_metadata_index.go +++ b/store_metadata_index.go @@ -44,6 +44,7 @@ type metadataStoreIndex struct { logger *zap.Logger } +//nolint:revive func (m *metadataStoreIndex) Get(key string) interface{} { return nil } @@ -641,6 +642,7 @@ func (m *metadataStoreIndex) handleMultiMemberInitialMember(event proto.Message) return nil } +//nolint:revive func (m *metadataStoreIndex) handleMultiMemberGrantAdminRole(event proto.Message) error { // TODO: @@ -760,7 +762,7 @@ func (m *metadataStoreIndex) postHandlerSentAliases() error { return nil } -// nolint:staticcheck +// nolint:staticcheck,revive // newMetadataIndex returns a new index to manage the list of the group members func newMetadataIndex(ctx context.Context, g *protocoltypes.Group, md secretstore.MemberDevice, secretStore secretstore.SecretStore) iface.IndexConstructor { return func(publicKey []byte) iface.StoreIndex { diff --git a/tinder_swiper.go b/tinder_swiper.go index 3e452a78..d3578584 100644 --- a/tinder_swiper.go +++ b/tinder_swiper.go @@ -71,7 +71,7 @@ func (s *Swiper) RefreshContactRequest(ctx context.Context, topic []byte) (addrs if !ok { err = fmt.Errorf("unknown topic") s.muRequest.Unlock() - return + return addrs, err } // add a refresh job process