From b2cf8e3da534c774414b7a0396d4889a3564ef79 Mon Sep 17 00:00:00 2001
From: Benjamin Wenger <ben@elixxir.ioo>
Date: Tue, 20 Oct 2020 10:40:39 -0700
Subject: [PATCH] removed the unregister return from registerListener
---
api/client.go | 3 ++-
bindings/client.go | 9 ++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/api/client.go b/api/client.go
index 7757aaaa5..40537629c 100644
--- a/api/client.go
+++ b/api/client.go
@@ -139,7 +139,8 @@ func NewPrecannedClient(precannedID uint, defJSON, storageDir string, password [
// Login initalizes a client object from existing storage.
func Login(storageDir string, password []byte) (*Client, error) {
// Use fastRNG for RNG ops (AES fortuna based RNG using system RNG)
- rngStreamGen := fastRNG.NewStreamGenerator(12, 3, csprng.NewSystemRNG)
+ rngStreamGen := fastRNG.NewStreamGenerator(12, 3,
+ csprng.NewSystemRNG)
// Load Storage
passwordStr := string(password)
diff --git a/bindings/client.go b/bindings/client.go
index 0d33e4649..056750aff 100644
--- a/bindings/client.go
+++ b/bindings/client.go
@@ -16,7 +16,6 @@ import (
"gitlab.com/elixxir/primitives/states"
"gitlab.com/xx_network/primitives/id"
"time"
- jww "github.com/spf13/jwalterweatherman"
)
// BindingsClient wraps the api.Client, implementing additional functions
@@ -145,12 +144,12 @@ func (c *Client) RegisterNetworkHealthCB(nhc NetworkHealthCallback) {
// Message Types can be found in client/interfaces/message/type.go
// Make sure to not conflict with ANY default message types
func (c *Client) RegisterListener(uid []byte, msgType int,
- listener Listener) (Unregister, error) {
+ listener Listener) error {
name := listener.Name()
u, err := id.Unmarshal(uid)
if err != nil {
- return Unregister{}, err
+ return err
}
mt := message.Type(msgType)
@@ -158,9 +157,9 @@ func (c *Client) RegisterListener(uid []byte, msgType int,
listener.Hear(item)
}
- lid := c.api.GetSwitchboard().RegisterFunc(name, u, mt, f)
+ c.api.GetSwitchboard().RegisterFunc(name, u, mt, f)
- return newListenerUnregister(lid, c.api.GetSwitchboard()), nil
+ return nil
}
// RegisterRoundEventsHandler registers a callback interface for round
--
GitLab