Skip to content
Snippets Groups Projects
Commit 20d4ec79 authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

Changes by jonahhusson

parent 670456b9
Branches
Tags
5 merge requests!510Release,!419rewrote the health tracker to both consider if there are waiting rounds and...,!370Full round obj,!369Full round obj,!340Project/channels
...@@ -269,7 +269,7 @@ func (g *GroupChat) Send(groupId, message []byte, tag string) ([]byte, error) { ...@@ -269,7 +269,7 @@ func (g *GroupChat) Send(groupId, message []byte, tag string) ([]byte, error) {
// Construct send report // Construct send report
sendReport := &GroupSendReport{ sendReport := &GroupSendReport{
RoundsList: makeRoundsList(round), RoundsList: makeRoundsList(round.ID),
Timestamp: timestamp.UnixNano(), Timestamp: timestamp.UnixNano(),
MessageID: msgID.Bytes(), MessageID: msgID.Bytes(),
} }
......
...@@ -69,7 +69,7 @@ func (m *mockCmix) GetMaxMessageLength() int { ...@@ -69,7 +69,7 @@ func (m *mockCmix) GetMaxMessageLength() int {
} }
func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler,
cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) {
fingerprint, service, payload, mac, err := assembler(42) fingerprint, service, payload, mac, err := assembler(42)
if err != nil { if err != nil {
...@@ -88,7 +88,7 @@ func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAss ...@@ -88,7 +88,7 @@ func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAss
p.Process(msg, receptionID.EphemeralIdentity{}, rounds.Round{}) p.Process(msg, receptionID.EphemeralIdentity{}, rounds.Round{})
} }
return 0, ephemeral.Id{}, nil return rounds.Round{}, ephemeral.Id{}, nil
} }
func (m *mockCmix) Send(recipient *id.ID, fingerprint format.Fingerprint, func (m *mockCmix) Send(recipient *id.ID, fingerprint format.Fingerprint,
......
...@@ -193,15 +193,15 @@ func (m *mockCmix) Send(_ *id.ID, fp format.Fingerprint, srv message.Service, ...@@ -193,15 +193,15 @@ func (m *mockCmix) Send(_ *id.ID, fp format.Fingerprint, srv message.Service,
if m.handler.processorMap[fp] != nil { if m.handler.processorMap[fp] != nil {
m.handler.processorMap[fp].Process( m.handler.processorMap[fp].Process(
msg, receptionID.EphemeralIdentity{}, rounds.Round{}) msg, receptionID.EphemeralIdentity{}, rounds.Round{})
return 0, ephemeral.Id{}, nil return rounds.Round{}, ephemeral.Id{}, nil
} else if m.handler.serviceMap[srv.Tag] != nil { } else if m.handler.serviceMap[srv.Tag] != nil {
m.handler.serviceMap[srv.Tag].Process( m.handler.serviceMap[srv.Tag].Process(
msg, receptionID.EphemeralIdentity{}, rounds.Round{}) msg, receptionID.EphemeralIdentity{}, rounds.Round{})
return 0, ephemeral.Id{}, nil return rounds.Round{}, ephemeral.Id{}, nil
} }
m.t.Errorf("No processor found for fingerprint %s", fp) m.t.Errorf("No processor found for fingerprint %s", fp)
return 0, ephemeral.Id{}, return rounds.Round{}, ephemeral.Id{},
errors.Errorf("No processor found for fingerprint %s", fp) errors.Errorf("No processor found for fingerprint %s", fp)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment