logos-messaging/logos-messaging-go-bindings
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-go-bindings.git synced 2026-01-02 14:03:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

implementing feedback

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

22
waku/nwaku.go
View File

@ -227,7 +227,7 @@ package waku
WAKU_CALL (waku_ping_peer(ctx, peerAddr, timeoutMs, (WakuCallBack) callback, resp) );
}
static void cGoWakuListPeersInMesh(void* ctx, char* pubSubTopic, void* resp) {
static void cGoWakuGetNumPeersInMesh(void* ctx, char* pubSubTopic, void* resp) {
WAKU_CALL (waku_relay_get_num_peers_in_mesh(ctx, pubSubTopic, (WakuCallBack) callback, resp) );
}
@ -390,8 +390,6 @@ func (w *Waku) Stop() error {
return err
}
// w.wg.Wait()
w.ctx = nil
w.cancel = nil
@ -463,7 +461,7 @@ const (
requestTypeDialPeerByID
requestTypeListenAddresses
requestTypeENR
requestTypeListPeersInMesh
requestTypeGetNumPeersInMesh
requestTypeGetConnectedPeers
requestTypeGetPeerIDsFromPeerStore
requestTypeGetPeerIDsByProtocol
@ -601,8 +599,8 @@ func (n *WakuNode) processLoop(ctx context.Context) {
case requestTypeENR:
enr, err := n.enr()
req.responseCh <- response{value: enr, err: err}
case requestTypeListPeersInMesh:
numPeers, err := n.listPeersInMesh(req.input.(string))
case requestTypeGetNumPeersInMesh:
numPeers, err := n.getNumPeersInMesh(req.input.(string))
req.responseCh <- response{value: numPeers, err: err}
case requestTypeGetConnectedPeers:
peers, err := n.getConnectedPeers()
@ -1065,24 +1063,24 @@ func (n *WakuNode) enr() (*enode.Node, error) {
return nil, errors.New(errMsg)
}
func (n *WakuNode) listPeersInMesh(pubsubTopic string) (int, error) {
func (n *WakuNode) getNumPeersInMesh(pubsubTopic string) (int, error) {
var resp = C.allocResp()
var cPubsubTopic = C.CString(pubsubTopic)
defer C.freeResp(resp)
defer C.free(unsafe.Pointer(cPubsubTopic))
C.cGoWakuListPeersInMesh(n.wakuCtx, cPubsubTopic, resp)
C.cGoWakuGetNumPeersInMesh(n.wakuCtx, cPubsubTopic, resp)
if C.getRet(resp) == C.RET_OK {
numPeersStr := C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp)))
numPeers, err := strconv.Atoi(numPeersStr)
if err != nil {
errMsg := "ListPeersInMesh - error converting string to int: " + err.Error()
errMsg := "GetNumPeersInMesh - error converting string to int: " + err.Error()
return 0, errors.New(errMsg)
}
return numPeers, nil
}
errMsg := "error ListPeersInMesh: " +
errMsg := "error GetNumPeersInMesh: " +
C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp)))
return 0, errors.New(errMsg)
}
@ -1342,8 +1340,8 @@ func (n *WakuNode) ENR() (*enode.Node, error) {
return response.(*enode.Node), nil
}
func (n *WakuNode) ListPeersInMesh(pubsubTopic string) (int, error) {
response, err := n.postTask(requestTypeListPeersInMesh, pubsubTopic)
func (n *WakuNode) GetNumPeersInMesh(pubsubTopic string) (int, error) {
response, err := n.postTask(requestTypeGetNumPeersInMesh, pubsubTopic)
if err != nil {
return 0, err
}

2
waku/nwaku_test.go
View File

@ -16,7 +16,7 @@ import (
"github.com/waku-org/go-waku/waku/v2/protocol/store"
)
// In order to run these tests, you must run an nwaku node
// In order to run this test, you must run an nwaku node
//
// Using Docker:
//