Merge pull request #36 from DragonDev1906/asset-unmarshal

Fix `Asset.UnmarshallBinary` not working

Signed-off-by: Steffen Rattay <[email protected]>

channel/asset.go

@@ -92,15 +92,15 @@ func (a Asset) MapKey() AssetMapKey {
 // MarshalBinary marshals the asset into its binary representation.
 func (a Asset) MarshalBinary() ([]byte, error) {
 	var buf bytes.Buffer
-	err := perunio.Encode(&buf, &a.AssetHolder, a.ChainID)
+	err := perunio.Encode(&buf, a.ChainID, &a.AssetHolder)
 	if err != nil {
 		return nil, err
 	}
 	return buf.Bytes(), nil
 }
 
 // UnmarshalBinary unmarshals the asset from its binary representation.
-func (a Asset) UnmarshalBinary(data []byte) error {
+func (a *Asset) UnmarshalBinary(data []byte) error {
 	buf := bytes.NewBuffer(data)
 	return perunio.Decode(buf, &a.ChainID, &a.AssetHolder)
 }

channel/asset_test.go

@@ -16,6 +16,7 @@ package channel_test
 
 import (
 	"context"
+	"math/big"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts"
@@ -124,3 +125,20 @@ func Test_Asset_GenericMarshaler(t *testing.T) {
 		wiretest.GenericMarshalerTest(t, &asset)
 	}
 }
+
+func TestMarshalling(t *testing.T) {
+	rng := pkgtest.Prng(t)
+	assetIn := ethchannel.Asset{
+		ChainID: ethchannel.ChainID{
+			big.NewInt(rng.Int63()),
+		},
+		AssetHolder: ethwallettest.NewRandomAddress(rng),
+	}
+	bytes, err := assetIn.MarshalBinary()
+	require.NoError(t, err)
+	var assetOut ethchannel.Asset
+	err = assetOut.UnmarshalBinary(bytes)
+	require.NoError(t, err)
+
+	require.Equal(t, assetIn, assetOut)
+}