Merge 49f3717 into 91b2ca4

fibercrypto · Jan 26, 2020 · 36c9485 · 36c9485
2 parents 91b2ca4 + 49f3717
commit 36c9485
Show file tree

Hide file tree

Showing 9 changed files with 1,790 additions and 151 deletions.
diff --git a/src/coin/mocks/ReadableTxn.go b/src/coin/mocks/ReadableTxn.go
diff --git a/src/coin/skycoin/models/account.go b/src/coin/skycoin/models/account.go
@@ -187,7 +187,7 @@ func (wlt *RemoteWallet) ListPendingTransactions() (core.TransactionIterator, er
 	}
 	txns := make([]core.Transaction, 0)
 	for _, ut := range response.Transactions {
-		txns = append(txns, &SkycoinPendingTransaction{Transaction: ut})
+		txns = append(txns, &SkycoinPendingTransaction{Transaction: &ut})
 	}
 	return NewSkycoinTransactionIterator(txns), nil
 }
@@ -308,7 +308,7 @@ func (wlt *LocalWallet) ListPendingTransactions() (core.TransactionIterator, err
 	}
 	txns := make([]core.Transaction, 0)
 	for _, ut := range response.Transactions {
-		txns = append(txns, &SkycoinPendingTransaction{Transaction: ut})
+		txns = append(txns, &SkycoinPendingTransaction{Transaction: &ut})
 	}
 	return NewSkycoinTransactionIterator(txns), nil
 }

diff --git a/src/coin/skycoin/models/account_test.go b/src/coin/skycoin/models/account_test.go
@@ -58,10 +58,10 @@ func TestWalletListPendingTransactions(t *testing.T) {
 		wlt := wallets.Value()
 		account := wlt.GetCryptoAccount()
 		global_mock.On(method, wlt.GetId()).Return(response, errors.New("failure")).Once()
-		txns, err := account.ListPendingTransactions() // nolint gosec
+		_, err := account.ListPendingTransactions()
 		require.Error(t, err)
 		global_mock.On(method, wlt.GetId()).Return(response, nil).Once()
-		txns, err = account.ListPendingTransactions()
+		txns, err := account.ListPendingTransactions()
 		require.NoError(t, err)
 		for txns.Next() {
 			iter := NewSkycoinTransactionOutputIterator(txns.Value().GetOutputs())
@@ -95,10 +95,10 @@ func TestSkycoinAddressGetBalance(t *testing.T) {
 	response.Confirmed = readable.Balance{Coins: uint64(42000000), Hours: uint64(200)}
 	skyAddrs := addr.GetCryptoAccount()
 	global_mock.On("Balance", []string{addr.String()}).Return(response, errors.New("failure")).Once()
-	val, err := skyAddrs.GetBalance(Sky) // nolint gosec
+	_, err = skyAddrs.GetBalance(Sky)
 	require.Error(t, err)
 	global_mock.On("Balance", []string{addr.String()}).Return(response, nil)
-	val, err = skyAddrs.GetBalance(Sky)
+	val, err := skyAddrs.GetBalance(Sky)
 	require.NoError(t, err)
 	require.Equal(t, val, uint64(42000000))
 	val, err = skyAddrs.GetBalance(CoinHour)
@@ -216,30 +216,30 @@ func TestLocalWalletGetBalance(t *testing.T) {
 
 	// wallet not found
 	wlt := &LocalWallet{WalletDir: "./testdata", Id: "no_wallet.wlt"}
-	val, err := wlt.GetBalance(Sky) // nolint gosec
+	_, err := wlt.GetBalance(Sky)
 	require.Error(t, err)
 
 	// api interaction error
 	wlt = &LocalWallet{WalletDir: "./testdata", Id: "test.wlt"}
-	val, err = wlt.GetBalance(Sky) // nolint gosec
+	_, err = wlt.GetBalance(Sky)
 	require.Error(t, err)
 
 	// invalid HeadOutputs
 	wlt = &LocalWallet{WalletDir: "./testdata", Id: "test.wlt"}
-	val, err = wlt.GetBalance(Sky) // nolint gosec
+	_, err = wlt.GetBalance(Sky)
 	require.Error(t, err)
 	response.HeadOutputs = response.HeadOutputs[:len(response.HeadOutputs)-1]
 
 	// all well
-	val, err = wlt.GetBalance(Sky)
+	val, err := wlt.GetBalance(Sky)
 	require.NoError(t, err)
 	require.Equal(t, uint64(84000000), val)
 	val, err = wlt.GetBalance(CoinHour)
 	require.NoError(t, err)
 	require.Equal(t, uint64(84), val)
 
 	//invalid ticker
-	_, err = wlt.GetBalance("INVALID_TICKER") // nolint gosec
+	_, err = wlt.GetBalance("INVALID_TICKER")
 	require.Error(t, err)
 }
 

diff --git a/src/coin/skycoin/models/blockchain_test.go b/src/coin/skycoin/models/blockchain_test.go
@@ -154,10 +154,10 @@ func TestSkycoinBlockchainStatusGetLastBlock(t *testing.T) {
 	status := &SkycoinBlockchain{CacheTime: 20}
 
 	// api interaction error
-	block, err := status.GetLastBlock() // nolint gosec
+	_, err := status.GetLastBlock()
 	require.Error(t, err)
 
-	block, err = status.GetLastBlock()
+	block, err := status.GetLastBlock()
 	require.NoError(t, err)
 	val, err2 := block.GetVersion()
 	require.NoError(t, err2)

diff --git a/src/coin/skycoin/models/coin.go b/src/coin/skycoin/models/coin.go
@@ -25,7 +25,7 @@ var logCoin = logging.MustGetLogger("Skycoin coin")
 	Implements Transaction interface
 */
 type SkycoinPendingTransaction struct {
-	Transaction readable.UnconfirmedTransactionVerbose
+	Transaction *readable.UnconfirmedTransactionVerbose
 }
 
 func (txn *SkycoinPendingTransaction) SupportedAssets() []string {
@@ -174,7 +174,7 @@ func (txn *SkycoinPendingTransaction) EncodeSkycoinTransaction() ([]byte, error)
 
 func verifyReadableTransaction(rTxn skytypes.ReadableTxn, checkSigned bool) error {
 	var createdTxn *api.CreatedTransaction
-	if cTxn, err := rTxn.ToCreatedTransaction(); err != nil {
+	if cTxn, err := rTxn.ToCreatedTransaction(); err == nil {
 		createdTxn = cTxn
 	} else {
 		return err