wallet: consider that NewFromString returns Undef address (textileio#391)

jsign · web-flow · commit a4f401e4fdcf · 2020-05-12T14:31:23.000-03:00
* wallet: consider that NewFromString returns Undef address and not error on empty strings

Signed-off-by: Ignacio Hagopian &lt;jsign.uy@gmail.com&gt;

* test fixes

Signed-off-by: Ignacio Hagopian &lt;jsign.uy@gmail.com&gt;
diff --git a/api/client/ffs.go b/api/client/ffs.go
@@ -2,7 +2,6 @@ package client
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"time"
 
@@ -542,9 +541,13 @@ func toRPCColdConfig(config ff.ColdConfig) *rpc.ColdConfig {
 func protoToDealError(des []*rpc.DealError) ([]ffs.DealError, error) {
 	res := make([]ffs.DealError, len(des))
 	for i, de := range des {
-		propCid, err := cid.Decode(de.ProposalCid)
-		if err != nil {
-			return nil, fmt.Errorf("parsing proposal cid: %s", err)
+		var propCid cid.Cid
+		if de.ProposalCid != "" {
+			var err error
+			propCid, err = cid.Decode(de.ProposalCid)
+			if err != nil {
+				propCid = cid.Undef
+			}
 		}
 		res[i] = ffs.DealError{
 			ProposalCid: propCid,
diff --git a/api/server/server.go b/api/server/server.go
@@ -173,7 +173,7 @@ func NewServer(conf Config) (*Server, error) {
 	if err != nil {
 		return nil, fmt.Errorf("creating deal module: %s", err)
 	}
-	wm, err := wallet.New(c, &masterAddr, conf.WalletInitialFunds)
+	wm, err := wallet.New(c, masterAddr, conf.WalletInitialFunds)
 	if err != nil {
 		return nil, fmt.Errorf("creating wallet module: %s", err)
 	}
diff --git a/ffs/integrationtest/integration_test.go b/ffs/integrationtest/integration_test.go
@@ -1207,7 +1207,7 @@ func newAPIFromDs(t *testing.T, ds datastore.TxnDatastore, iid ffs.APIID, client
 	hl := coreipfs.New(ipfsClient, l)
 	sched := scheduler.New(js, as, cis, l, hl, cl)
 
-	wm, err := wallet.New(client, &waddr, *big.NewInt(iWalletBal))
+	wm, err := wallet.New(client, waddr, *big.NewInt(iWalletBal))
 	require.Nil(t, err)
 
 	var fapi *api.API
diff --git a/ffs/manager/manager_test.go b/ffs/manager/manager_test.go
@@ -101,7 +101,7 @@ func TestGetByAuthToken(t *testing.T) {
 
 func newManager(t *testing.T, ds datastore.TxnDatastore) (*Manager, func()) {
 	client, addr, _ := tests.CreateLocalDevnet(t, 1)
-	wm, err := wallet.New(client, &addr, *big.NewInt(4000000000))
+	wm, err := wallet.New(client, addr, *big.NewInt(4000000000))
 	require.Nil(t, err)
 	m, err := New(ds, wm, &mockSched{})
 	require.Nil(t, err)
diff --git a/wallet/wallet.go b/wallet/wallet.go
@@ -15,11 +15,11 @@ import (
 type Module struct {
 	api        *apistruct.FullNodeStruct
 	iAmount    *big.Int
-	masterAddr *address.Address
+	masterAddr address.Address
 }
 
 // New creates a new wallet module
-func New(api *apistruct.FullNodeStruct, maddr *address.Address, iam big.Int) (*Module, error) {
+func New(api *apistruct.FullNodeStruct, maddr address.Address, iam big.Int) (*Module, error) {
 	m := &Module{
 		api:        api,
 		iAmount:    &iam,
@@ -44,9 +44,9 @@ func (m *Module) NewAddress(ctx context.Context, typ string) (string, error) {
 		return "", err
 	}
 
-	if m.masterAddr != nil {
+	if m.masterAddr != address.Undef {
 		msg := &types.Message{
-			From:     *m.masterAddr,
+			From:     m.masterAddr,
 			To:       addr,
 			Value:    types.BigInt{Int: m.iAmount},
 			GasLimit: 1000,

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func NewServer(conf Config) (*Server, error) {`
`173`	`173`	`if err != nil {`
`174`	`174`	`return nil, fmt.Errorf("creating deal module: %s", err)`
`175`	`175`	`}`
`176`		`- wm, err := wallet.New(c, &masterAddr, conf.WalletInitialFunds)`
	`176`	`+ wm, err := wallet.New(c, masterAddr, conf.WalletInitialFunds)`
`177`	`177`	`if err != nil {`
`178`	`178`	`return nil, fmt.Errorf("creating wallet module: %s", err)`
`179`	`179`	`}`