Skip to content
Snippets Groups Projects
Commit 9ee4e0f6 authored by Jake Taylor's avatar Jake Taylor
Browse files

fix tests

parent 48577cb4
No related branches found
No related tags found
No related merge requests found
......@@ -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
}
......
......@@ -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
}
......
......@@ -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
}
......
......@@ -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
}
......
......@@ -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)
}
......@@ -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
}
......
......@@ -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)
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment