Review comments and linting

This commit is contained in:
Kegan Dougal 2020-05-13 11:52:22 +01:00
parent a2d62fbb1b
commit 63f3bfa8b3
2 changed files with 8 additions and 1 deletions

View file

@ -33,7 +33,6 @@ var (
randomMessageEvent gomatrixserverlib.HeaderedEvent randomMessageEvent gomatrixserverlib.HeaderedEvent
aliceInviteBobEvent gomatrixserverlib.HeaderedEvent aliceInviteBobEvent gomatrixserverlib.HeaderedEvent
bobLeaveEvent gomatrixserverlib.HeaderedEvent bobLeaveEvent gomatrixserverlib.HeaderedEvent
baseSyncPos = types.NewStreamToken(0, 0)
syncPositionVeryOld = types.NewStreamToken(5, 0) syncPositionVeryOld = types.NewStreamToken(5, 0)
syncPositionBefore = types.NewStreamToken(11, 0) syncPositionBefore = types.NewStreamToken(11, 0)
syncPositionAfter = types.NewStreamToken(12, 0) syncPositionAfter = types.NewStreamToken(12, 0)

View file

@ -189,6 +189,10 @@ func NewTopologyTokenFromString(tok string) (token TopologyToken, err error) {
err = fmt.Errorf("token %s is not a topology token", tok) err = fmt.Errorf("token %s is not a topology token", tok)
return return
} }
if len(t.Positions) != 2 {
err = fmt.Errorf("token %s wrong number of values, got %d want 2", tok, len(t.Positions))
return
}
return TopologyToken{ return TopologyToken{
syncToken: *t, syncToken: *t,
}, nil }, nil
@ -212,6 +216,10 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
err = fmt.Errorf("token %s is not a streaming token", tok) err = fmt.Errorf("token %s is not a streaming token", tok)
return return
} }
if len(t.Positions) != 2 {
err = fmt.Errorf("token %s wrong number of values, got %d want 2", tok, len(t.Positions))
return
}
return StreamingToken{ return StreamingToken{
syncToken: *t, syncToken: *t,
}, nil }, nil