Fix old references from merge

network/follow.go

@@ -159,7 +159,7 @@ func (m *manager) follow(rng csprng.Source, comms followNetworkComms) {
 			for _, clientErr := range update.ClientErrors {
 
 				// If this Client appears in the ClientError
-				if bytes.Equal(clientErr.ClientId, m.Session.GetUser().ID.Marshal()) {
+				if bytes.Equal(clientErr.ClientId, m.Session.GetUser().TransmissionID.Marshal()) {
 
 					// Obtain relevant NodeGateway information
 					nGw, err := m.Instance.GetNodeAndGateway(gwHost.GetId())

network/message/garbled_test.go

@@ -42,8 +42,8 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
 	l := TestListener{
 		ch: make(chan bool),
 	}
-	sw.RegisterListener(sess2.GetUser().ID, message.Raw, l)
-	comms, err := client.NewClientComms(sess1.GetUser().ID, nil, nil, nil)
+	sw.RegisterListener(sess2.GetUser().TransmissionID, message.Raw, l)
+	comms, err := client.NewClientComms(sess1.GetUser().TransmissionID, nil, nil, nil)
 	if err != nil {
 		t.Errorf("Failed to start client comms: %+v", err)
 	}
@@ -53,7 +53,7 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
 		Rng:              fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
 		Comms:            comms,
 		Health:           nil,
-		Uid:              sess1.GetUser().ID,
+		Uid:              sess1.GetUser().TransmissionID,
 		Instance:         nil,
 		NodeRegistration: nil,
 	}
@@ -65,18 +65,18 @@ func TestManager_CheckGarbledMessages(t *testing.T) {
 	}, nil)
 
 	e2ekv := i.Session.E2e()
-	err = e2ekv.AddPartner(sess2.GetUser().ID, sess2.E2e().GetDHPublicKey(), e2ekv.GetDHPrivateKey(), e2e.GetDefaultSessionParams(), e2e.GetDefaultSessionParams())
+	err = e2ekv.AddPartner(sess2.GetUser().ReceptionID, sess2.E2e().GetDHPublicKey(), e2ekv.GetDHPrivateKey(), e2e.GetDefaultSessionParams(), e2e.GetDefaultSessionParams())
 	if err != nil {
 		t.Errorf("Failed to add e2e partner: %+v", err)
 		t.FailNow()
 	}
 
-	err = sess2.E2e().AddPartner(sess1.GetUser().ID, sess1.E2e().GetDHPublicKey(), sess2.E2e().GetDHPrivateKey(), e2e.GetDefaultSessionParams(), e2e.GetDefaultSessionParams())
+	err = sess2.E2e().AddPartner(sess1.GetUser().ReceptionID, sess1.E2e().GetDHPublicKey(), sess2.E2e().GetDHPrivateKey(), e2e.GetDefaultSessionParams(), e2e.GetDefaultSessionParams())
 	if err != nil {
 		t.Errorf("Failed to add e2e partner: %+v", err)
 		t.FailNow()
 	}
-	partner1, err := sess2.E2e().GetPartner(sess1.GetUser().ID)
+	partner1, err := sess2.E2e().GetPartner(sess1.GetUser().ReceptionID)
 	if err != nil {
 		t.Errorf("Failed to get partner: %+v", err)
 		t.FailNow()