diff --git a/connect/utils_test.go b/connect/utils_test.go index 6e4be5173d00cd8ba4b671d6abee3a8669e1c77c..63257119c4d6e3c59ad3616c4e5d31d0669969c1 100644 --- a/connect/utils_test.go +++ b/connect/utils_test.go @@ -157,6 +157,12 @@ func (m *mockCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, []byte, cmix.CMIXParams) (id.Round, ephemeral.Id, error) { return 0, ephemeral.Id{}, nil } + +func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + return 0, ephemeral.Id{}, nil +} + func (m *mockCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { return 0, []ephemeral.Id{}, nil } diff --git a/dummy/mockCmix_test.go b/dummy/mockCmix_test.go index f8211be97a777d23f59458416075154dd055e067..6de2a2a2998d6ac024006f7082cc349f9751e149 100644 --- a/dummy/mockCmix_test.go +++ b/dummy/mockCmix_test.go @@ -46,6 +46,20 @@ func (m *mockCmix) Send(recipient *id.ID, fingerprint format.Fingerprint, servic return 0, ephemeral.Id{}, nil } +func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + m.Lock() + defer m.Unlock() + + fingerprint, service, payload, mac, err := assembler(42) + if err != nil { + return 0, ephemeral.Id{}, err + } + m.messages[*recipient] = generateMessage(m.payloadSize, fingerprint, service, payload, mac) + + return 0, ephemeral.Id{}, nil +} + func (m *mockCmix) GetMsgListLen() int { m.RLock() defer m.RUnlock() diff --git a/e2e/fpGenerator_test.go b/e2e/fpGenerator_test.go index ebd2d7cc381a3d3ccc908b9118b697226bb0af59..5b739154251b923d537eb92e76c14d841a133890 100644 --- a/e2e/fpGenerator_test.go +++ b/e2e/fpGenerator_test.go @@ -116,6 +116,10 @@ func (m *mockFpgCmix) GetMaxMessageLength() int func (m *mockFpgCmix) Send(*id.ID, format.Fingerprint, message.Service, []byte, []byte, cmix.CMIXParams) (id.Round, ephemeral.Id, error) { return 0, ephemeral.Id{}, nil } +func (m *mockFpgCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + return 0, ephemeral.Id{}, nil +} func (m *mockFpgCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { return 0, nil, nil } diff --git a/e2e/rekey/utils_test.go b/e2e/rekey/utils_test.go index 3e1f77f1dcdc80a760498da5ea6b1905b90cec84..3e78bf5947e675939cc6b585bfa6c1ca0a4130cf 100644 --- a/e2e/rekey/utils_test.go +++ b/e2e/rekey/utils_test.go @@ -237,6 +237,11 @@ func (m *mockNetManager) Send(recipient *id.ID, fingerprint format.Fingerprint, return id.Round(0), ephemeral.Id{}, nil } +func (m *mockNetManager) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + return id.Round(0), ephemeral.Id{}, nil +} + func (m *mockNetManager) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) ( id.Round, []ephemeral.Id, error) { return id.Round(0), nil, nil diff --git a/e2e/utils_test.go b/e2e/utils_test.go index 72bcfb3402d76c2d22b8351f1283a367ba771fc9..6394c9be5d8405e333a6964af3594d11cea0006e 100644 --- a/e2e/utils_test.go +++ b/e2e/utils_test.go @@ -199,6 +199,11 @@ func (m *mockCmix) Send(_ *id.ID, fp format.Fingerprint, srv message.Service, } +func (m *mockCmix) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) SendMany([]cmix.TargetedCmixMessage, cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { return 0, nil, nil } diff --git a/fileTransfer/connect/utils_test.go b/fileTransfer/connect/utils_test.go index 7d0fb6aeba668c2fcccf89cd881746007a84a101..ab24fcda0e0f9ee27b0396d62f652bbea2c56072 100644 --- a/fileTransfer/connect/utils_test.go +++ b/fileTransfer/connect/utils_test.go @@ -120,6 +120,11 @@ 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) (id.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { m.handler.Lock() diff --git a/fileTransfer/e2e/utils_test.go b/fileTransfer/e2e/utils_test.go index 164d155740c789916f1ff5a96b3bd3c89079c61f..786e4ca4f51a67b4236b771ab3c295186d3d3cd6 100644 --- a/fileTransfer/e2e/utils_test.go +++ b/fileTransfer/e2e/utils_test.go @@ -122,6 +122,11 @@ 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) (id.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { m.handler.Lock() diff --git a/fileTransfer/groupChat/utils_test.go b/fileTransfer/groupChat/utils_test.go index 38604350816258fbb6e9c85ac882525f78ec3909..44a94a656f53e7c95c88812b870a40dcf7720f3c 100644 --- a/fileTransfer/groupChat/utils_test.go +++ b/fileTransfer/groupChat/utils_test.go @@ -116,6 +116,11 @@ 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) (id.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { m.handler.Lock() diff --git a/fileTransfer/utils_test.go b/fileTransfer/utils_test.go index df51d90ddaa113ce471244217d567fa3868a1883..d9ce7a19513d883a1da618946512b9de71b422ec 100644 --- a/fileTransfer/utils_test.go +++ b/fileTransfer/utils_test.go @@ -170,6 +170,11 @@ 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) (id.Round, ephemeral.Id, error) { + panic("implement me") +} + func (m *mockCmix) SendMany(messages []cmix.TargetedCmixMessage, _ cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { m.handler.Lock() diff --git a/groupChat/networkManager_test.go b/groupChat/networkManager_test.go index a6df5a6427d976a21a652d89db81e8941348f34e..5fa33e8c2b7e135eb3aed54bdc516f3c10f33b71 100644 --- a/groupChat/networkManager_test.go +++ b/groupChat/networkManager_test.go @@ -71,6 +71,13 @@ func (tnm *testNetworkManager) Follow(report cmix.ClientErrorReport) (stoppable. panic("implement me") } +func (tnm *testNetworkManager) SendWithAssembler(recipient *id.ID, + assembler cmix.MessageAssembler, cmixParams cmix.CMIXParams) (id.Round, + ephemeral.Id, error) { + //TODO implement me + panic("implement me") +} + func (tnm *testNetworkManager) Send(recipient *id.ID, fingerprint format.Fingerprint, service message.Service, payload, mac []byte, cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { //TODO implement me panic("implement me") diff --git a/xxdk/utilsInterfaces_test.go b/xxdk/utilsInterfaces_test.go index 29317d133e3031c8af10eb945ad6fc726d174c1e..380ccbdee50d82be348890f336fe872727f06c7f 100644 --- a/xxdk/utilsInterfaces_test.go +++ b/xxdk/utilsInterfaces_test.go @@ -112,6 +112,13 @@ func (t *testNetworkManagerGeneric) Send(*id.ID, format.Fingerprint, ephemeral.Id, error) { return id.Round(0), ephemeral.Id{}, nil } + +func (t *testNetworkManagerGeneric) SendWithAssembler(recipient *id.ID, assembler cmix.MessageAssembler, + cmixParams cmix.CMIXParams) (id.Round, ephemeral.Id, error) { + + return 0, ephemeral.Id{}, nil +} + func (t *testNetworkManagerGeneric) SendMany(messages []cmix.TargetedCmixMessage, p cmix.CMIXParams) (id.Round, []ephemeral.Id, error) { return 0, []ephemeral.Id{}, nil