status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-02-08 21:04:27 +00:00
Code Issues Projects Releases Wiki Activity

adding disconnect functionality

Browse Source
This commit is contained in:
Gabriel mermelstein 2024-10-11 15:51:13 +03:00
parent 56e51d79d9
commit ba45cbc8cc
No known key found for this signature in database
GPG Key ID: 82B8134785FEAE0D
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wakuv2/nwaku.go
View File

@ -182,6 +182,13 @@ package wakuv2
resp) ); resp) );
} }
static void cGoWakuDisconnectPeerById(void* wakuCtx, char* peerId, void* resp) {
WAKU_CALL( waku_disconnect_peer_by_id(wakuCtx,
peerId,
(WakuCallBack) callback,
resp) );
}
static void cGoWakuListenAddresses(void* wakuCtx, void* resp) { static void cGoWakuListenAddresses(void* wakuCtx, void* resp) {
WAKU_CALL (waku_listen_addresses(wakuCtx, (WakuCallBack) callback, resp) ); WAKU_CALL (waku_listen_addresses(wakuCtx, (WakuCallBack) callback, resp) );
} }
@ -2253,12 +2260,12 @@ func (self *Waku) GetNumConnectedPeers(paramPubsubTopic ...string) (int, error)
numPeers, err := strconv.Atoi(numPeersStr) numPeers, err := strconv.Atoi(numPeersStr)
if err != nil { if err != nil {
fmt.Println(":", err) fmt.Println(":", err)
errMsg := "ListPeersInMesh - error converting string to int: " + err.Error() errMsg := "GetNumConnectedPeers - error converting string to int: " + err.Error()
return 0, errors.New(errMsg) return 0, errors.New(errMsg)
} }
return numPeers, nil return numPeers, nil
} }
errMsg := "error ListPeersInMesh: " + errMsg := "error GetNumConnectedPeers: " +
C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp))) C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp)))
return 0, errors.New(errMsg) return 0, errors.New(errMsg)
} }
@ -2273,6 +2280,9 @@ func (self *Waku) GetPeerIdsByProtocol(protocol string) (peer.IDSlice, error) {
if C.getRet(resp) == C.RET_OK { if C.getRet(resp) == C.RET_OK {
peersStr := C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp))) peersStr := C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp)))
if peersStr == "" {
return peer.IDSlice{}, nil
}
// peersStr contains a comma-separated list of peer ids // peersStr contains a comma-separated list of peer ids
itemsPeerIds := strings.Split(peersStr, ",") itemsPeerIds := strings.Split(peersStr, ",")
@ -2280,7 +2290,7 @@ func (self *Waku) GetPeerIdsByProtocol(protocol string) (peer.IDSlice, error) {
for _, peer := range itemsPeerIds { for _, peer := range itemsPeerIds {
id, err := peermod.Decode(peer) id, err := peermod.Decode(peer)
if err != nil { if err != nil {
errMsg := "ListPeersInMesh - error converting string to int: " + err.Error() errMsg := "GetPeerIdsByProtocol - error converting string to int: " + err.Error()
return nil, errors.New(errMsg) return nil, errors.New(errMsg)
} }
peers = append(peers, id) peers = append(peers, id)
@ -2293,6 +2303,22 @@ func (self *Waku) GetPeerIdsByProtocol(protocol string) (peer.IDSlice, error) {
return nil, errors.New(errMsg) return nil, errors.New(errMsg)
} }
func (self *Waku) DisconnectPeerById(peerId peer.ID) error {
var resp = C.allocResp()
var cPeerId = C.CString(peerId.String())
defer C.freeResp(resp)
defer C.free(unsafe.Pointer(cPeerId))
C.cGoWakuDisconnectPeerById(self.wakuCtx, cPeerId, resp)
if C.getRet(resp) == C.RET_OK {
return nil
}
errMsg := "error DisconnectPeerById: " +
C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp)))
return errors.New(errMsg)
}
// func main() { // func main() {
// config := WakuConfig{ // config := WakuConfig{

7
wakuv2/nwaku_test.go
View File

@ -213,9 +213,14 @@ func TestBasicWakuV2(t *testing.T) {
connectedStoreNodes, err := w.GetPeerIdsByProtocol(string(store.StoreQueryID_v300)) connectedStoreNodes, err := w.GetPeerIdsByProtocol(string(store.StoreQueryID_v300))
require.True(t, slices.Contains(connectedStoreNodes, storeNode.ID), "nwaku should be connected to the store node") require.True(t, slices.Contains(connectedStoreNodes, storeNode.ID), "nwaku should be connected to the store node")
err = w.DropPeer(storeNode.ID) err = w.DisconnectPeerById(storeNode.ID)
require.NoError(t, err) require.NoError(t, err)
connectedStoreNodes, err = w.GetPeerIdsByProtocol(string(store.StoreQueryID_v300))
require.NoError(t, err)
isDisconnected := !slices.Contains(connectedStoreNodes, storeNode.ID)
require.True(t, isDisconnected, "nwaku should be disconnected from the store node")
/* // Dropping Peer /* // Dropping Peer
err = w.DropPeer(storeNode.PeerID) err = w.DropPeer(storeNode.PeerID)
require.NoError(t, err) require.NoError(t, err)