Skip to content

Commit 0d17b17

Browse files
committed
Review comments
1 parent 3d48766 commit 0d17b17

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

authstate.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,10 +165,7 @@ func checkAllowedByAuthEvents(
165165
event PDU, eventsByID map[string]PDU,
166166
missingAuth EventProvider, userIDForSender spec.UserIDForSender,
167167
) error {
168-
authEvents, err := NewAuthEvents(nil)
169-
if err != nil {
170-
return err
171-
}
168+
authEvents, _ := NewAuthEvents(nil)
172169

173170
for _, ae := range event.AuthEventIDs() {
174171
retryEvent:
@@ -338,10 +335,7 @@ func CheckSendJoinResponse(
338335
}
339336

340337
eventsByID := map[string]PDU{}
341-
authEventProvider, err := NewAuthEvents(nil)
342-
if err != nil {
343-
return nil, err
344-
}
338+
authEventProvider, _ := NewAuthEvents(nil)
345339

346340
// Since checkAllowedByAuthEvents needs to be able to look up any of the
347341
// auth events by ID only, we will build a map which contains references

stateresolutionv2.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,12 @@ func (r *stateResolverV2) getFirstPowerLevelMainlineEvent(event PDU) (
444444
func (r *stateResolverV2) authAndApplyEvents(events ...PDU) {
445445
addFromAuthEventsIfNotRejected := func(event PDU, eventType, stateKey string) {
446446
for _, authEventID := range event.AuthEventIDs() {
447-
if _, ok := r.isRejectedCache[authEventID]; !ok {
448-
r.isRejectedCache[authEventID] = r.isRejectedFn(authEventID)
447+
rejected, ok := r.isRejectedCache[authEventID]
448+
if !ok {
449+
rejected = r.isRejectedFn(authEventID)
450+
r.isRejectedCache[authEventID] = rejected
449451
}
450-
if rejected := r.isRejectedCache[authEventID]; rejected {
452+
if rejected {
451453
continue
452454
}
453455
authEv, ok := r.authEventMap[authEventID]

0 commit comments

Comments
 (0)