From 5f39c1d498152c04dd3d747b61fd01144373b7cd Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Thu, 16 Apr 2020 17:00:17 -0700 Subject: [PATCH] make peer handling of NewRetValMessage optional, as UI handles it fully --- peer/cwtch_peer.go | 7 +++---- testing/cwtch_peer_server_integration_test.go | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go index 02b1a20..4baeac2 100644 --- a/peer/cwtch_peer.go +++ b/peer/cwtch_peer.go @@ -108,7 +108,7 @@ func (cp *cwtchPeer) Init(eventBus event.Manager) { cp.eventBus = eventBus cp.AutoHandleEvents([]event.Type{event.EncryptedGroupMessage, event.NewMessageFromPeer, event.PeerAcknowledgement, - event.PeerError, event.SendMessageToGroupError, event.NewGetValMessageFromPeer, event.NewRetValMessageFromPeer}) + event.PeerError, event.SendMessageToGroupError, event.NewGetValMessageFromPeer}) } // AutoHandleEvents sets an event (if able) to be handled by this peer @@ -568,6 +568,8 @@ func (cp *cwtchPeer) eventHandler() { cp.eventBus.Publish(resp) } + /***** Non default but requestable handlable events *****/ + case event.NewRetValMessageFromPeer: onion := ev.Data[event.RemotePeer] scope := ev.Data[event.Scope] @@ -580,9 +582,6 @@ func (cp *cwtchPeer) eventHandler() { cp.SetContactAttribute(onion, attr.GetPeerScope(path), val) } } - - /***** Non default but requestable handlable events *****/ - case event.NewGroupInvite: cp.mutex.Lock() cp.Profile.ProcessInvite(ev.Data[event.GroupInvite], ev.Data[event.RemotePeer]) diff --git a/testing/cwtch_peer_server_integration_test.go b/testing/cwtch_peer_server_integration_test.go index 83f3288..9992b33 100644 --- a/testing/cwtch_peer_server_integration_test.go +++ b/testing/cwtch_peer_server_integration_test.go @@ -173,17 +173,17 @@ func TestCwtchPeerIntegration(t *testing.T) { alice := utils.WaitGetPeer(app, "alice") fmt.Println("Alice created:", alice.GetOnion()) alice.SetAttribute(attr.GetPublicScope("name"), "Alice") - alice.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite}) + alice.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite, event.NewRetValMessageFromPeer}) bob := utils.WaitGetPeer(app, "bob") fmt.Println("Bob created:", bob.GetOnion()) bob.SetAttribute(attr.GetPublicScope("name"), "Bob") - bob.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite}) + bob.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite, event.NewRetValMessageFromPeer}) carol := utils.WaitGetPeer(appClient, "carol") fmt.Println("Carol created:", carol.GetOnion()) carol.SetAttribute(attr.GetPublicScope("name"), "Carol") - carol.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite}) + carol.AutoHandleEvents([]event.Type{event.PeerStateChange, event.ServerStateChange, event.NewGroupInvite, event.NewRetValMessageFromPeer}) app.LaunchPeers() appClient.LaunchPeers()