diff --git a/go.mod b/go.mod index 7eec51b..07b99e5 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,13 @@ module github.com/waku-org/waku-go-bindings go 1.22.10 require ( - go.uber.org/multierr v1.10.0 // indirect - go.uber.org/zap v1.27.0 // indirect + github.com/stretchr/testify v1.8.1 + go.uber.org/zap v1.27.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + go.uber.org/multierr v1.10.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index e1a34f3..ea719a5 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,20 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/sds/sds.go b/sds/sds.go index fffccf4..17bae21 100644 --- a/sds/sds.go +++ b/sds/sds.go @@ -77,6 +77,10 @@ package sds SetEventCallback(rmCtx, (SdsCallBack) globalEventCallback, rmCtx); } + + static void cGoCleanupReliabilityManager(void* rmCtx, void* resp) { + CleanupReliabilityManager(rmCtx, (SdsCallBack) GoCallback, resp); + } */ import "C" import ( @@ -105,15 +109,15 @@ func GoCallback(ret C.int, msg *C.char, len C.size_t, resp unsafe.Pointer) { // ReliabilityManager represents an instance of a nim-sds ReliabilityManager type ReliabilityManager struct { rmCtx unsafe.Pointer - rmName string + name string channelId string } -func NewReliabilityManager(channelId string, rmName string) (*ReliabilityManager, error) { - Debug("Creating new WakuNode: %v", rmName) +func NewReliabilityManager(channelId string, name string) (*ReliabilityManager, error) { + Debug("Creating new Reliability Manager: %v", name) rm := &ReliabilityManager{ channelId: channelId, - rmName: rmName, + name: name, } wg := sync.WaitGroup{} @@ -126,7 +130,7 @@ func NewReliabilityManager(channelId string, rmName string) (*ReliabilityManager if C.getRet(resp) != C.RET_OK { errMsg := C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp))) - Error("error NewReliabilityManager for %s: %v", rmName, errMsg) + Error("error NewReliabilityManager for %s: %v", name, errMsg) return nil, errors.New(errMsg) } @@ -137,7 +141,7 @@ func NewReliabilityManager(channelId string, rmName string) (*ReliabilityManager C.cGoSetEventCallback(rm.rmCtx) registerReliabilityManager(rm) - Debug("Successfully created WakuNode: %s", rmName) + Debug("Successfully created Reliability Manager: %s", name) return rm, nil } @@ -168,7 +172,7 @@ func unregisterReliabilityManager(rm *ReliabilityManager) { func globalEventCallback(callerRet C.int, msg *C.char, len C.size_t, userData unsafe.Pointer) { if callerRet == C.RET_OK { eventStr := C.GoStringN(msg, C.int(len)) - rm, ok := rmRegistry[userData] // userData contains node's ctx + rm, ok := rmRegistry[userData] // userData contains rm's ctx if ok { rm.OnEvent(eventStr) } @@ -186,7 +190,7 @@ type jsonEvent struct { EventType string `json:"eventType"` } -func (n *ReliabilityManager) OnEvent(eventStr string) { +func (rm *ReliabilityManager) OnEvent(eventStr string) { jsonEvent := jsonEvent{} err := json.Unmarshal([]byte(eventStr), &jsonEvent) if err != nil { @@ -202,3 +206,32 @@ func (n *ReliabilityManager) OnEvent(eventStr string) { fmt.Println("-------- received event 1") } } + +func (rm *ReliabilityManager) Cleanup() error { + if rm == nil { + err := errors.New("reliability manager is nil") + Error("Failed to destroy %v", err) + return err + } + + Debug("Destroying %v", rm.name) + + wg := sync.WaitGroup{} + var resp = C.allocResp(unsafe.Pointer(&wg)) + defer C.freeResp(resp) + + wg.Add(1) + C.cGoCleanupReliabilityManager(rm.rmCtx, resp) + wg.Wait() + + if C.getRet(resp) == C.RET_OK { + unregisterReliabilityManager(rm) + Debug("Successfully destroyed %s", rm.name) + return nil + } + + errMsg := "error CleanupReliabilityManager: " + C.GoStringN(C.getMyCharPtr(resp), C.int(C.getMyCharLen(resp))) + Error("Failed to destroy %v: %v", rm.name, errMsg) + + return errors.New(errMsg) +} diff --git a/sds/sds_test.go b/sds/sds_test.go new file mode 100644 index 0000000..8158de8 --- /dev/null +++ b/sds/sds_test.go @@ -0,0 +1,22 @@ +package sds + +import ( + "testing" + + "github.com/stretchr/testify/require" +) + +func TestCreateAndCleanup(t *testing.T) { + + rm1, err := NewReliabilityManager("my-channel-id", "rm1") + require.NoError(t, err) + + rm2, err := NewReliabilityManager("my-channel-id-2", "rm2") + require.NoError(t, err) + + err = rm1.Cleanup() + require.NoError(t, err) + + err = rm2.Cleanup() + require.NoError(t, err) +}