From 03a85ceda2a39db944d713ba93981f29ab907610 Mon Sep 17 00:00:00 2001 From: Jake Taylor <jake@elixxir.io> Date: Tue, 5 Jan 2021 11:39:21 -0600 Subject: [PATCH] added params bindings --- bindings/params.go | 37 ++++++++++++++++++++++++++++++++ interfaces/params/CMIX.go | 2 +- interfaces/params/E2E.go | 2 +- interfaces/params/Unsafe.go | 6 +----- interfaces/params/keyExchange.go | 2 +- interfaces/params/network.go | 2 +- 6 files changed, 42 insertions(+), 9 deletions(-) create mode 100644 bindings/params.go diff --git a/bindings/params.go b/bindings/params.go new file mode 100644 index 000000000..3d21838d9 --- /dev/null +++ b/bindings/params.go @@ -0,0 +1,37 @@ +/////////////////////////////////////////////////////////////////////////////// +// Copyright © 2021 xx network SEZC // +// // +// Use of this source code is governed by a license that can be found in the // +// LICENSE file // +/////////////////////////////////////////////////////////////////////////////// + +// Contains params-related bindings + +package bindings + +import "gitlab.com/elixxir/client/interfaces/params" + +func (c *Client) GetCMIXParams() (string, error) { + p, err := params.GetDefaultCMIX().Marshal() + return string(p), err +} + +func (c *Client) GetE2EParams() (string, error) { + p, err := params.GetDefaultE2E().Marshal() + return string(p), err +} + +func (c *Client) GetRekeyParams() (string, error) { + p, err := params.GetDefaultRekey().Marshal() + return string(p), err +} + +func (c *Client) GetNetworkParams() (string, error) { + p, err := params.GetDefaultNetwork().Marshal() + return string(p), err +} + +func (c *Client) GetUnsafeParams() (string, error) { + p, err := params.GetDefaultUnsafe().Marshal() + return string(p), err +} diff --git a/interfaces/params/CMIX.go b/interfaces/params/CMIX.go index 46e6dc7c6..e4142eb5e 100644 --- a/interfaces/params/CMIX.go +++ b/interfaces/params/CMIX.go @@ -27,7 +27,7 @@ func GetDefaultCMIX() CMIX { } } -func (c *CMIX) Marshal() ([]byte, error) { +func (c CMIX) Marshal() ([]byte, error) { return json.Marshal(c) } diff --git a/interfaces/params/E2E.go b/interfaces/params/E2E.go index 0afba14b9..7a2e38428 100644 --- a/interfaces/params/E2E.go +++ b/interfaces/params/E2E.go @@ -22,7 +22,7 @@ func GetDefaultE2E() E2E { CMIX: GetDefaultCMIX(), } } -func (e *E2E) Marshal() ([]byte, error) { +func (e E2E) Marshal() ([]byte, error) { return json.Marshal(e) } diff --git a/interfaces/params/Unsafe.go b/interfaces/params/Unsafe.go index 54c31a371..556559a88 100644 --- a/interfaces/params/Unsafe.go +++ b/interfaces/params/Unsafe.go @@ -17,14 +17,10 @@ func GetDefaultUnsafe() Unsafe { return Unsafe{CMIX: GetDefaultCMIX()} } -func (u *Unsafe) MarshalJSON() ([]byte, error) { +func (u Unsafe) Marshal() ([]byte, error) { return json.Marshal(u) } -func (u *Unsafe) UnmarshalJSON(b []byte) error { - return json.Unmarshal(b, u) -} - // Obtain default Unsafe parameters, or override with given parameters if set func GetUnsafeParameters(params string) (Unsafe, error) { p := GetDefaultUnsafe() diff --git a/interfaces/params/keyExchange.go b/interfaces/params/keyExchange.go index 5b83a2adf..24166e304 100644 --- a/interfaces/params/keyExchange.go +++ b/interfaces/params/keyExchange.go @@ -22,7 +22,7 @@ func GetDefaultRekey() Rekey { } } -func (r *Rekey) Marshal() ([]byte, error) { +func (r Rekey) Marshal() ([]byte, error) { return json.Marshal(r) } diff --git a/interfaces/params/network.go b/interfaces/params/network.go index 1f79dc558..3c5da7cad 100644 --- a/interfaces/params/network.go +++ b/interfaces/params/network.go @@ -38,7 +38,7 @@ func GetDefaultNetwork() Network { return n } -func (n *Network) Marshal() ([]byte, error) { +func (n Network) Marshal() ([]byte, error) { return json.Marshal(n) } -- GitLab