Merge remote-tracking branch 'origin/api2.0' into api2.0

ud/lookup_test.go

@@ -83,7 +83,7 @@ func TestManager_Lookup(t *testing.T) {
 	p := single.RequestParams{
 		Timeout:             timeout,
 		MaxResponseMessages: 1,
-		CmixParam:           cmix.GetDefaultCMIXParams(),
+		CmixParams:          cmix.GetDefaultCMIXParams(),
 	}
 
 	// Run the lookup

ud/search_test.go

@@ -68,7 +68,7 @@ func TestManager_Search(t *testing.T) {
 	p := single.RequestParams{
 		Timeout:             timeout,
 		MaxResponseMessages: 1,
-		CmixParam:           cmix.GetDefaultCMIXParams(),
+		CmixParams:          cmix.GetDefaultCMIXParams(),
 	}
 
 	_, _, err = Search(m.network, m.events, prng, m.e2e.GetGroup(),

ud/utils_test.go

@@ -78,7 +78,7 @@ func newTestManager(t *testing.T) (*Manager, *testNetworkManager) {
 
 	// Create our Manager object
 	m := &Manager{
-		e2e:    mockE2e{},
+		e2e:    mockE2e{grp: getGroup()},
 		events: event.NewEventManager(),
 		user:   mockUser{testing: t, key: key},
 		store:  udStore,
@@ -398,7 +398,13 @@ func (m mockComms) GetHost(hostId *id.ID) (*connect.Host, bool) {
 	return m.udHost, true
 }
 
-type mockE2e struct{}
+type mockE2e struct {
+	grp *cyclic.Group
+}
+
+func (m mockE2e) GetHistoricalDHPubkey() *cyclic.Int {
+	return m.grp.NewInt(6)
+}
 
 func (m mockE2e) GetReceptionID() *id.ID {
 	//TODO implement me