Skip to content
Snippets Groups Projects
Commit ed63febf authored by Jono Wenger's avatar Jono Wenger
Browse files

Fix NewPickup in Test_pickup_CheckInProgressMessages

parent 11c4a93e
No related branches found
No related tags found
4 merge requests!510Release,!207WIP: Client Restructure,!203Symmetric broadcast,!187Xx 3829/triggers
...@@ -5,14 +5,12 @@ import ( ...@@ -5,14 +5,12 @@ import (
"gitlab.com/elixxir/client/interfaces" "gitlab.com/elixxir/client/interfaces"
"gitlab.com/elixxir/client/interfaces/message" "gitlab.com/elixxir/client/interfaces/message"
"gitlab.com/elixxir/client/interfaces/params" "gitlab.com/elixxir/client/interfaces/params"
"gitlab.com/elixxir/client/network/gateway"
"gitlab.com/elixxir/client/stoppable" "gitlab.com/elixxir/client/stoppable"
"gitlab.com/elixxir/client/storage" "gitlab.com/elixxir/client/storage/versioned"
pb "gitlab.com/elixxir/comms/mixmessages" pb "gitlab.com/elixxir/comms/mixmessages"
"gitlab.com/elixxir/crypto/fastRNG" "gitlab.com/elixxir/ekv"
"gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/format"
"gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/connect"
"gitlab.com/xx_network/crypto/csprng"
"gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/id"
"os" "os"
"testing" "testing"
...@@ -40,100 +38,19 @@ func (l TestListener) Name() string { ...@@ -40,100 +38,19 @@ func (l TestListener) Name() string {
} }
func Test_pickup_CheckInProgressMessages(t *testing.T) { func Test_pickup_CheckInProgressMessages(t *testing.T) {
sess := storage.InitTestingSession(t) kv := versioned.NewKV(make(ekv.Memstore))
rngGen := fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG) p := NewPickup(params.Network{Messages: params.Messages{
poolParams := gateway.DefaultPoolParams()
poolParams.MaxPoolSize = 1
sender, err := gateway.NewSender(
poolParams, rngGen, getNDF(), &MockSendCMIXComms{t}, sess, nil)
if err != nil {
t.Errorf("Failed to make new sender: %+v", err)
}
newPickup := NewPickup(params.Network{Messages: params.Messages{
MessageReceptionBuffLen: 20, MessageReceptionBuffLen: 20,
MessageReceptionWorkerPoolSize: 20, MessageReceptionWorkerPoolSize: 20,
MaxChecksInProcessMessage: 20, MaxChecksInProcessMessage: 20,
InProcessMessageWait: time.Hour, InProcessMessageWait: time.Hour,
}}, sender, sess, nil) }}, kv, nil).(*pickup)
p := newPickup.(*pickup)
// rng := csprng.NewSystemRNG()
// partnerSIDHPrivKey := util.NewSIDHPrivateKey(sidh.KeyVariantSidhA)
// partnerSIDHPubKey := util.NewSIDHPublicKey(sidh.KeyVariantSidhA)
// partnerSIDHPrivKey.Generate(rng)
// partnerSIDHPrivKey.GeneratePublicKey(partnerSIDHPubKey)
// mySIDHPrivKey := util.NewSIDHPrivateKey(sidh.KeyVariantSidhB)
// mySIDHPubKey := util.NewSIDHPublicKey(sidh.KeyVariantSidhB)
// mySIDHPrivKey.Generate(rng)
// mySIDHPrivKey.GeneratePublicKey(mySIDHPubKey)
//
// e2ekv := i.Session.E2e()
// err = e2ekv.AddPartner(sess2.GetUser().TransmissionID,
// sess2.E2e().GetDHPublicKey(), e2ekv.GetDHPrivateKey(),
// partnerSIDHPubKey, mySIDHPrivKey,
// params.GetDefaultE2ESessionParams(),
// params.GetDefaultE2ESessionParams())
// if err != nil {
// t.Errorf("Failed to add e2e partner: %+v", err)
// t.FailNow()
// }
//
// preimage := edge.Preimage{
// Data: []byte{0},
// Type: "test",
// Source: nil,
// }
// p.Session.GetEdge().Add(preimage, sess2.GetUser().ReceptionID)
//
// err = sess2.E2e().AddPartner(sess.GetUser().TransmissionID,
// sess.E2e().GetDHPublicKey(), sess2.E2e().GetDHPrivateKey(),
// mySIDHPubKey, partnerSIDHPrivKey,
// params.GetDefaultE2ESessionParams(),
// params.GetDefaultE2ESessionParams())
// if err != nil {
// t.Errorf("Failed to add e2e partner: %+v", err)
// t.FailNow()
// }
// partner1, err := sess2.E2e().GetPartner(sess.GetUser().ReceptionID)
// if err != nil {
// t.Errorf("Failed to get partner: %+v", err)
// t.FailNow()
// }
// msg := format.NewMessage(format.MinimumPrimeSize)
//
// key, err := partner1.GetKeyForSending(params.Standard)
// if err != nil {
// t.Errorf("failed to get key: %+v", err)
// t.FailNow()
// }
//
// contents := make([]byte, msg.ContentsSize())
// prng := rand.New(rand.NewSource(42))
// prng.Read(contents)
// contents[len(contents)-1] = 0
// fmp := parse.FirstMessagePartFromBytes(contents)
// binary.BigEndian.PutUint32(fmp.Type, message.Raw)
// fmp.NumParts[0] = uint8(1)
// binary.BigEndian.PutUint16(fmp.Len, 256)
// fmp.Part[0] = 0
// ts, err := netTime.Now().MarshalBinary()
// if err != nil {
// t.Errorf("failed to martial ts: %+v", err)
// }
// copy(fmp.Timestamp, ts)
// msg.SetContents(fmp.Bytes())
// encryptedMsg := key.Encrypt(msg)
// msg.SetIdentityFP(fingerprint.IdentityFP(msg.GetContents(), preimage.Data))
// i.Session.GetGarbledMessages().Add(encryptedMsg)
msg := makeTestFormatMessages(1)[0] msg := makeTestFormatMessages(1)[0]
cid := id.NewIdFromString("clientID", id.User, t) cid := id.NewIdFromString("clientID", id.User, t)
fp := format.NewFingerprint([]byte("test")) fp := format.NewFingerprint([]byte("test"))
mp := NewMockMsgProcessor(t) mp := NewMockMsgProcessor(t)
err = p.AddFingerprint(cid, fp, mp) err := p.AddFingerprint(cid, fp, mp)
if err != nil { if err != nil {
t.Errorf("Failed to add fingerprint: %+v", err) t.Errorf("Failed to add fingerprint: %+v", err)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment