From 9ee4e0f6a2206425bfcd5e20220247e301e4a767 Mon Sep 17 00:00:00 2001
From: Jake Taylor <jake@elixxir.io>
Date: Tue, 5 Jan 2021 11:32:28 -0600
Subject: [PATCH] fix tests
---
interfaces/params/CMIX.go | 8 ++------
interfaces/params/E2E.go | 9 ++-------
interfaces/params/Unsafe.go | 2 +-
interfaces/params/keyExchange.go | 8 ++------
interfaces/params/message.go | 9 ---------
interfaces/params/network.go | 8 ++------
interfaces/params/rounds.go | 9 ---------
7 files changed, 9 insertions(+), 44 deletions(-)
diff --git a/interfaces/params/CMIX.go b/interfaces/params/CMIX.go
index 203bb7187..46e6dc7c6 100644
--- a/interfaces/params/CMIX.go
+++ b/interfaces/params/CMIX.go
@@ -27,19 +27,15 @@ func GetDefaultCMIX() CMIX {
}
}
-func (c *CMIX) MarshalJSON() ([]byte, error) {
+func (c *CMIX) Marshal() ([]byte, error) {
return json.Marshal(c)
}
-func (c *CMIX) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, c)
-}
-
// Obtain default CMIX parameters, or override with given parameters if set
func GetCMIXParameters(params string) (CMIX, error) {
p := GetDefaultCMIX()
if len(params) > 0 {
- err := p.UnmarshalJSON([]byte(params))
+ err := json.Unmarshal([]byte(params), &p)
if err != nil {
return CMIX{}, err
}
diff --git a/interfaces/params/E2E.go b/interfaces/params/E2E.go
index db9599cd2..0afba14b9 100644
--- a/interfaces/params/E2E.go
+++ b/interfaces/params/E2E.go
@@ -22,20 +22,15 @@ func GetDefaultE2E() E2E {
CMIX: GetDefaultCMIX(),
}
}
-
-func (e *E2E) MarshalJSON() ([]byte, error) {
+func (e *E2E) Marshal() ([]byte, error) {
return json.Marshal(e)
}
-func (e *E2E) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, e)
-}
-
// Obtain default E2E parameters, or override with given parameters if set
func GetE2EParameters(params string) (E2E, error) {
p := GetDefaultE2E()
if len(params) > 0 {
- err := p.UnmarshalJSON([]byte(params))
+ err := json.Unmarshal([]byte(params), &p)
if err != nil {
return E2E{}, err
}
diff --git a/interfaces/params/Unsafe.go b/interfaces/params/Unsafe.go
index 19e9fed23..54c31a371 100644
--- a/interfaces/params/Unsafe.go
+++ b/interfaces/params/Unsafe.go
@@ -29,7 +29,7 @@ func (u *Unsafe) UnmarshalJSON(b []byte) error {
func GetUnsafeParameters(params string) (Unsafe, error) {
p := GetDefaultUnsafe()
if len(params) > 0 {
- err := p.UnmarshalJSON([]byte(params))
+ err := json.Unmarshal([]byte(params), &p)
if err != nil {
return Unsafe{}, err
}
diff --git a/interfaces/params/keyExchange.go b/interfaces/params/keyExchange.go
index 7d76b8fb9..5b83a2adf 100644
--- a/interfaces/params/keyExchange.go
+++ b/interfaces/params/keyExchange.go
@@ -22,19 +22,15 @@ func GetDefaultRekey() Rekey {
}
}
-func (r *Rekey) MarshalJSON() ([]byte, error) {
+func (r *Rekey) Marshal() ([]byte, error) {
return json.Marshal(r)
}
-func (r *Rekey) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, r)
-}
-
// Obtain default Rekey parameters, or override with given parameters if set
func GetRekeyParameters(params string) (Rekey, error) {
p := GetDefaultRekey()
if len(params) > 0 {
- err := p.UnmarshalJSON([]byte(params))
+ err := json.Unmarshal([]byte(params), &p)
if err != nil {
return Rekey{}, err
}
diff --git a/interfaces/params/message.go b/interfaces/params/message.go
index 16d1fde29..fbf977982 100644
--- a/interfaces/params/message.go
+++ b/interfaces/params/message.go
@@ -8,7 +8,6 @@
package params
import (
- "encoding/json"
"time"
)
@@ -27,11 +26,3 @@ func GetDefaultMessage() Messages {
GarbledMessageWait: 15 * time.Minute,
}
}
-
-func (m *Messages) MarshalJSON() ([]byte, error) {
- return json.Marshal(m)
-}
-
-func (m *Messages) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, m)
-}
diff --git a/interfaces/params/network.go b/interfaces/params/network.go
index 8e9f57ef6..1f79dc558 100644
--- a/interfaces/params/network.go
+++ b/interfaces/params/network.go
@@ -38,19 +38,15 @@ func GetDefaultNetwork() Network {
return n
}
-func (n *Network) MarshalJSON() ([]byte, error) {
+func (n *Network) Marshal() ([]byte, error) {
return json.Marshal(n)
}
-func (n *Network) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, n)
-}
-
// Obtain default Network parameters, or override with given parameters if set
func GetNetworkParameters(params string) (Network, error) {
p := GetDefaultNetwork()
if len(params) > 0 {
- err := p.UnmarshalJSON([]byte(params))
+ err := json.Unmarshal([]byte(params), &p)
if err != nil {
return Network{}, err
}
diff --git a/interfaces/params/rounds.go b/interfaces/params/rounds.go
index 8370f7096..483e68721 100644
--- a/interfaces/params/rounds.go
+++ b/interfaces/params/rounds.go
@@ -8,7 +8,6 @@
package params
import (
- "encoding/json"
"time"
)
@@ -42,11 +41,3 @@ func GetDefaultRounds() Rounds {
LookupRoundsBufferLen: 2000,
}
}
-
-func (r *Rounds) MarshalJSON() ([]byte, error) {
- return json.Marshal(r)
-}
-
-func (r *Rounds) UnmarshalJSON(b []byte) error {
- return json.Unmarshal(b, r)
-}
--
GitLab