diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go index 83d75d020beccafe57c72331b0595a05253c0470..6c9de504f42e812ec9bfc7c2c9925667241daa71 100644 --- a/fileTransfer/connect/utils_test.go +++ b/fileTransfer/connect/utils_test.go @@ -119,11 +119,6 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, panic("implement me") } -func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, - cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { - panic("implement me") -} - func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) { m.handler.Lock() @@ -140,6 +135,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, return rounds.Round{ID: 42}, []ephemeral.Id{}, nil } +func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler, + cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") } func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") } func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") } @@ -196,10 +196,12 @@ func (m *mockCmix) GetRoundResults(_ time.Duration, func (m *mockCmix) LookupHistoricalRound(id.Round, rounds.RoundResultCallback) error { panic("implement me") } -func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), *stoppable.Single) (interface{}, error) { +func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), + *stoppable.Single) (interface{}, error) { panic("implement me") } -func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, *stoppable.Single, time.Duration) (interface{}, error) { +func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, + *stoppable.Single, time.Duration) (interface{}, error) { panic("implement me") } func (m *mockCmix) SetGatewayFilter(gateway.Filter) { panic("implement me") } diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go index a9e17b912810dbf24bf640d518bf2c434e95181b..7de4bba2c25ddb23103da9f04c4a6eac8898984c 100644 --- a/fileTransfer/e2e/utils_test.go +++ b/fileTransfer/e2e/utils_test.go @@ -121,11 +121,6 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, panic("implement me") } -func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, - cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { - panic("implement me") -} - func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) { m.handler.Lock() @@ -142,6 +137,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, return rounds.Round{ID: 42}, []ephemeral.Id{}, nil } +func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler, + cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") } func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") } func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") } @@ -198,10 +198,12 @@ func (m *mockCmix) GetRoundResults(_ time.Duration, func (m *mockCmix) LookupHistoricalRound(id.Round, rounds.RoundResultCallback) error { panic("implement me") } -func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), *stoppable.Single) (interface{}, error) { +func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), + *stoppable.Single) (interface{}, error) { panic("implement me") } -func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, *stoppable.Single, time.Duration) (interface{}, error) { +func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, + *stoppable.Single, time.Duration) (interface{}, error) { panic("implement me") } func (m *mockCmix) SetGatewayFilter(gateway.Filter) { panic("implement me") } diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go index 76b2ba1285a05381f719089e03bca00248182218..61dd18006d7d80b35712cc938267a2f5bd2ae4f7 100644 --- a/fileTransfer/groupChat/utils_test.go +++ b/fileTransfer/groupChat/utils_test.go @@ -116,11 +116,6 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, panic("implement me") } -func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, - cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { - panic("implement me") -} - func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) { m.handler.Lock() @@ -137,6 +132,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, return rounds.Round{ID: 42}, []ephemeral.Id{}, nil } +func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler, + cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") } func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") } func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") } @@ -193,10 +193,12 @@ func (m *mockCmix) GetRoundResults(_ time.Duration, func (m *mockCmix) LookupHistoricalRound(id.Round, rounds.RoundResultCallback) error { panic("implement me") } -func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), *stoppable.Single) (interface{}, error) { +func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), + *stoppable.Single) (interface{}, error) { panic("implement me") } -func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, *stoppable.Single, time.Duration) (interface{}, error) { +func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, + *stoppable.Single, time.Duration) (interface{}, error) { panic("implement me") } func (m *mockCmix) SetGatewayFilter(gateway.Filter) { panic("implement me") } diff --git a/fileTransfer/send.go b/fileTransfer/send.go index fb4bbddb36c66d5a7f5ebd0bfff9d7b160bbdc91..ea9bac2027cc65f2db3ede5ee8ef684cb1eb7f05 100644 --- a/fileTransfer/send.go +++ b/fileTransfer/send.go @@ -141,7 +141,8 @@ func (m *manager) sendCmix(packet []store.Part) { // roundResultsCallback generates a network.RoundEventCallback that handles // all parts in the packet once the round succeeds or fails. -func (m *manager) roundResultsCallback(packet []store.Part) cmix.RoundEventCallback { +func (m *manager) roundResultsCallback( + packet []store.Part) cmix.RoundEventCallback { // Group file parts by transfer grouped := map[ftCrypto.TransferID][]store.Part{} for _, p := range packet { diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go index 96c400a9dfdaa63cb84242b083e41325c25606d1..ff7750fcbce0c8d99f260ffdd2c48bb6d64d14a7 100644 --- a/fileTransfer/utils_test.go +++ b/fileTransfer/utils_test.go @@ -170,11 +170,6 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, panic("implement me") } -func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, - cmixParams cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { - panic("implement me") -} - func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (rounds.Round, []ephemeral.Id, error) { m.handler.Lock() @@ -193,6 +188,11 @@ func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, return rounds.Round{ID: round}, []ephemeral.Id{}, nil } +func (m *mockCmix) SendWithAssembler(*id.ID, cmix.MessageAssembler, + cmix.CMIXParams) (rounds.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) AddIdentity(*id.ID, time.Time, bool) { panic("implement me") } func (m *mockCmix) RemoveIdentity(*id.ID) { panic("implement me") } func (m *mockCmix) GetIdentity(*id.ID) (identity.TrackedID, error) { panic("implement me") } @@ -249,10 +249,12 @@ func (m *mockCmix) GetRoundResults(_ time.Duration, func (m *mockCmix) LookupHistoricalRound(id.Round, rounds.RoundResultCallback) error { panic("implement me") } -func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), *stoppable.Single) (interface{}, error) { +func (m *mockCmix) SendToAny(func(host *connect.Host) (interface{}, error), + *stoppable.Single) (interface{}, error) { panic("implement me") } -func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, *stoppable.Single, time.Duration) (interface{}, error) { +func (m *mockCmix) SendToPreferred([]*id.ID, gateway.SendToPreferredFunc, + *stoppable.Single, time.Duration) (interface{}, error) { panic("implement me") } func (m *mockCmix) SetGatewayFilter(gateway.Filter) { panic("implement me") }