github/atomic-swap
1
1
Fork 0
mirror of https://github.com/AthanorLabs/atomic-swap.git synced 2026-01-09 14:18:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

JSON validation (#309)

Browse Source 
Integrates the go-playground validator library into our codebase for objects that are serialized/deserialized.
This commit is contained in:
Dmitry Holodov
2023-02-18 18:37:52 -06:00
committed by GitHub
parent f65e5b6a77
commit b157adc28b
19 changed files with 261 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ethereum/swap_factory_marshal.go
View File

@@ -1,12 +1,12 @@
package contracts
import (
"encoding/json"
"math/big"
"github.com/ethereum/go-ethereum/common"
"github.com/athanorlabs/atomic-swap/common/types"
"github.com/athanorlabs/atomic-swap/common/vjson"
)
// swap is the same as the auto-generated SwapFactorySwap type, but with some type
@@ -16,16 +16,16 @@ type swap struct {
Claimer common.Address `json:"claimer"`
PubKeyClaim types.Hash `json:"pub_key_claim"`
PubKeyRefund types.Hash `json:"pub_key_refund"`
Timeout0 *big.Int `json:"timeout0"`
Timeout1 *big.Int `json:"timeout1"`
Timeout0 *big.Int `json:"timeout0" validate:"required"`
Timeout1 *big.Int `json:"timeout1" validate:"required"`
Asset common.Address `json:"asset"`
Value *big.Int `json:"value"`
Nonce *big.Int `json:"nonce"`
Value *big.Int `json:"value" validate:"required"`
Nonce *big.Int `json:"nonce" validate:"required"`
}
// MarshalJSON provides JSON marshalling for SwapFactorySwap
func (sfs *SwapFactorySwap) MarshalJSON() ([]byte, error) {
return json.Marshal(&swap{
return vjson.MarshalStruct(&swap{
Owner: sfs.Owner,
Claimer: sfs.Claimer,
PubKeyClaim: sfs.PubKeyClaim,
@@ -41,7 +41,7 @@ func (sfs *SwapFactorySwap) MarshalJSON() ([]byte, error) {
// UnmarshalJSON provides JSON unmarshalling for SwapFactorySwap
func (sfs *SwapFactorySwap) UnmarshalJSON(data []byte) error {
s := &swap{}
if err := json.Unmarshal(data, s); err != nil {
if err := vjson.UnmarshalStruct(data, s); err != nil {
return err
}
*sfs = SwapFactorySwap{

3
ethereum/swap_factory_marshal_test.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/athanorlabs/atomic-swap/coins"
"github.com/athanorlabs/atomic-swap/common/vjson"
)
func TestSwapFactorySwap_JSON(t *testing.T) {
@@ -36,7 +37,7 @@ func TestSwapFactorySwap_JSON(t *testing.T) {
"value": 9876000000000000000000,
"nonce": 1234
}`
jsonData, err := json.Marshal(sf)
jsonData, err := vjson.MarshalStruct(sf)
require.NoError(t, err)
require.JSONEq(t, expectedJSON, string(jsonData))