Skip to content

Commit 7f9f8b2

Browse files
authored
Merge pull request #23 from jefft0/fix/setHeadsForGroup-groupID
fix: Only declare groupID once In setHeadsForGroup and OpenGroup
2 parents 36b25b5 + 6726686 commit 7f9f8b2

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

orbitdb.go

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -250,14 +250,14 @@ func (s *WeshOrbitDB) openAccountGroup(ctx context.Context, options *orbitdb.Cre
250250
}
251251

252252
func (s *WeshOrbitDB) setHeadsForGroup(ctx context.Context, g *protocoltypes.Group, metaHeads, messageHeads []cid.Cid) error {
253-
id := g.GroupIDAsString()
253+
groupID := g.GroupIDAsString()
254254

255255
var (
256256
err error
257257
metaImpl, messagesImpl orbitdb.Store
258258
)
259259

260-
existingGC, err := s.getGroupContext(id)
260+
existingGC, err := s.getGroupContext(groupID)
261261
if err != nil && !errcode.Is(err, errcode.ErrMissingMapKey) {
262262
return errcode.ErrInternal.Wrap(err)
263263
}
@@ -266,7 +266,6 @@ func (s *WeshOrbitDB) setHeadsForGroup(ctx context.Context, g *protocoltypes.Gro
266266
messagesImpl = existingGC.messageStore
267267
}
268268
if metaImpl == nil || messagesImpl == nil {
269-
groupID := g.GroupIDAsString()
270269
s.groups.Store(groupID, g)
271270

272271
if err := s.registerGroupSigningPubKey(g); err != nil {
@@ -380,17 +379,16 @@ func (s *WeshOrbitDB) OpenGroup(ctx context.Context, g *protocoltypes.Group, opt
380379
return nil, errcode.ErrInvalidInput.Wrap(fmt.Errorf("db open in naive mode"))
381380
}
382381

383-
id := g.GroupIDAsString()
382+
groupID := g.GroupIDAsString()
384383

385-
existingGC, err := s.getGroupContext(id)
384+
existingGC, err := s.getGroupContext(groupID)
386385
if err != nil && !errcode.Is(err, errcode.ErrMissingMapKey) {
387386
return nil, errcode.ErrInternal.Wrap(err)
388387
}
389388
if err == nil {
390389
return existingGC, nil
391390
}
392391

393-
groupID := g.GroupIDAsString()
394392
s.groups.Store(groupID, g)
395393

396394
if err := s.registerGroupPrivateKey(g); err != nil {

0 commit comments

Comments
 (0)