mirror of
https://github.com/status-im/status-keycard-go.git
synced 2025-02-24 12:08:38 +00:00
rename signal functions
This commit is contained in:
parent
187bb7a2bd
commit
443d478555
6
main.go
6
main.go
@ -414,9 +414,9 @@ func ChangePairingPassword(jsonParams *C.char) *C.char {
|
||||
return retValue("ok", true)
|
||||
}
|
||||
|
||||
//export SetSignalEventCallback
|
||||
func SetSignalEventCallback(cb unsafe.Pointer) {
|
||||
signal.SetSignalEventCallback(cb)
|
||||
//export KeycardSetSignalEventCallback
|
||||
func KeycardSetSignalEventCallback(cb unsafe.Pointer) {
|
||||
signal.KeycardSetSignalEventCallback(cb)
|
||||
}
|
||||
|
||||
func bytesToInt(s []byte) int {
|
||||
|
@ -10,7 +10,7 @@
|
||||
typedef void (*callback)(const char *jsonEvent);
|
||||
callback gCallback = 0;
|
||||
|
||||
bool StatusServiceSignalEvent(const char *jsonEvent) {
|
||||
bool KeycardServiceSignalEvent(const char *jsonEvent) {
|
||||
if (gCallback) {
|
||||
gCallback(jsonEvent);
|
||||
} else {
|
||||
@ -20,6 +20,6 @@ bool StatusServiceSignalEvent(const char *jsonEvent) {
|
||||
return true;
|
||||
}
|
||||
|
||||
void SetEventCallback(void *cb) {
|
||||
void KeycardSetEventCallback(void *cb) {
|
||||
gCallback = (callback)cb;
|
||||
}
|
||||
|
@ -4,8 +4,8 @@ package signal
|
||||
#include <stddef.h>
|
||||
#include <stdbool.h>
|
||||
#include <stdlib.h>
|
||||
extern bool StatusServiceSignalEvent(const char *jsonEvent);
|
||||
extern void SetEventCallback(void *cb);
|
||||
extern bool KeycardServiceSignalEvent(const char *jsonEvent);
|
||||
extern void KeycardSetEventCallback(void *cb);
|
||||
*/
|
||||
import "C"
|
||||
import (
|
||||
@ -17,14 +17,14 @@ import (
|
||||
"github.com/ethereum/go-ethereum/log"
|
||||
)
|
||||
|
||||
// MobileSignalHandler is a simple callback function that gets called when any signal is received
|
||||
type MobileSignalHandler func([]byte)
|
||||
// KeycardSignalHandler is a simple callback function that gets called when any signal is received
|
||||
type KeycardSignalHandler func([]byte)
|
||||
|
||||
// storing the current signal handler here
|
||||
var mobileSignalHandler MobileSignalHandler
|
||||
var keycardSignalHandler KeycardSignalHandler
|
||||
|
||||
// All general log messages in this package should be routed through this logger.
|
||||
var logger = log.New("package", "status-go/signal")
|
||||
var logger = log.New("package", "keycard-go/signal")
|
||||
|
||||
// Envelope is a general signal sent upward from node to RN app
|
||||
type Envelope struct {
|
||||
@ -49,12 +49,12 @@ func send(typ string, event interface{}) {
|
||||
return
|
||||
}
|
||||
// If a Go implementation of signal handler is set, let's use it.
|
||||
if mobileSignalHandler != nil {
|
||||
mobileSignalHandler(data)
|
||||
if keycardSignalHandler != nil {
|
||||
keycardSignalHandler(data)
|
||||
} else {
|
||||
// ...and fallback to C implementation otherwise.
|
||||
str := C.CString(string(data))
|
||||
C.StatusServiceSignalEvent(str)
|
||||
C.KeycardServiceSignalEvent(str)
|
||||
C.free(unsafe.Pointer(str))
|
||||
}
|
||||
}
|
||||
@ -99,18 +99,18 @@ func NotifyNode(jsonEvent *C.char) {
|
||||
//nolint: golint
|
||||
func TriggerTestSignal() {
|
||||
str := C.CString(`{"answer": 42}`)
|
||||
C.StatusServiceSignalEvent(str)
|
||||
C.KeycardServiceSignalEvent(str)
|
||||
C.free(unsafe.Pointer(str))
|
||||
}
|
||||
|
||||
// SetMobileSignalHandler sets new handler for geth events
|
||||
// SetKeycardSignalHandler sets new handler for geth events
|
||||
// this function uses pure go implementation
|
||||
func SetMobileSignalHandler(handler MobileSignalHandler) {
|
||||
mobileSignalHandler = handler
|
||||
func SetKeycardSignalHandler(handler KeycardSignalHandler) {
|
||||
keycardSignalHandler = handler
|
||||
}
|
||||
|
||||
// SetSignalEventCallback set callback
|
||||
// KeycardSetSignalEventCallback set callback
|
||||
// this function uses C implementation (see `signals.c` file)
|
||||
func SetSignalEventCallback(cb unsafe.Pointer) {
|
||||
C.SetEventCallback(cb)
|
||||
func KeycardSetSignalEventCallback(cb unsafe.Pointer) {
|
||||
C.KeycardSetEventCallback(cb)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user