Skip to content

Commit

Permalink
[test] refs fibercrypto#143 - Change require.Nil(t, err) for require.…
Browse files Browse the repository at this point in the history
…NotError(t, err).
  • Loading branch information
AntiD2ta committed Nov 8, 2019
1 parent 7d6ce3a commit 456d634
Showing 1 changed file with 21 additions and 23 deletions.
44 changes: 21 additions & 23 deletions src/coin/skycoin/models/wallet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ func TestTransactionFinderAddressesActivity(t *testing.T) {
thxF := &TransactionFinder{}

mask, err := thxF.AddressesActivity([]cipher.Address{})
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 0, len(mask))
require.Equal(t, []bool{}, mask)

mask, err = thxF.AddressesActivity(addresses)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, 3, len(mask))
require.Equal(t, false, mask[0])
for i := 1; i < 3; i++ {
Expand Down Expand Up @@ -113,12 +113,12 @@ func TestSkycoinRemoteWalletCreateWallet(t *testing.T) {
}

wlt1, err := wltSrv.CreateWallet(label, seed, true, pwdReader, scanN)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, "walletEncrypted", wlt1.GetLabel())
require.Equal(t, "FiberCrypto", wlt1.GetId())

wlt2, err := wltSrv.CreateWallet(label, seed, false, pwdReader, scanN)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, "walletNonEncrypted", wlt2.GetLabel())
require.Equal(t, "FiberCrypto", wlt2.GetId())
}
Expand All @@ -143,11 +143,11 @@ func TestSkycoinRemoteWalletIsEncrypted(t *testing.T) {
wltSrv := &SkycoinRemoteWallet{poolSection: PoolSection}

encrypted, err := wltSrv.IsEncrypted("encrypted")
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, true, encrypted)

encrypted, err = wltSrv.IsEncrypted("nonEncrypted")
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, false, encrypted)
}

Expand Down Expand Up @@ -188,7 +188,7 @@ func TestRemoteWalletSignSkycoinTxn(t *testing.T) {
fee: 100,
}
encodedResponse, err := unTxn.txn.SerializeHex()
require.Nil(t, err)
require.NoError(t, err)

walletSignTxn := api.WalletSignTransactionRequest{
EncodedTransaction: encodedResponse,
Expand All @@ -199,7 +199,7 @@ func TestRemoteWalletSignSkycoinTxn(t *testing.T) {

crtTxn, err := api.NewCreateTransactionResponse(&txn, nil)
crtTxn.Transaction.Fee = "100"
require.Nil(t, err)
require.NoError(t, err)

global_mock.On("WalletSignTransaction", walletSignTxn).Return(
crtTxn,
Expand Down Expand Up @@ -280,7 +280,7 @@ func TestRemoteWalletTransfer(t *testing.T) {
InnerHash: hash,
}
crtTxn, err := api.NewCreateTransactionResponse(&txn, nil)
require.Nil(t, err)
require.NoError(t, err)
crtTxn.Transaction.Fee = "500"

mockSkyApiWalletCreateTransaction(global_mock, &wreq, crtTxn)
Expand All @@ -290,7 +290,7 @@ func TestRemoteWalletTransfer(t *testing.T) {
poolSection: PoolSection,
}
quot, err := util.AltcoinQuotient(params.SkycoinTicker)
require.Nil(t, err)
require.NoError(t, err)

destination := &SkycoinTransactionOutput{
skyOut: readable.TransactionOutput{
Expand All @@ -299,10 +299,10 @@ func TestRemoteWalletTransfer(t *testing.T) {
}}

ret, err := wlt.Transfer(destination, opt)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, ret)
val, err := ret.ComputeFee(CoinHour)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, uint64(sky), val)
require.Equal(t, crtTxn.Transaction.TxID, ret.GetId())

Expand Down Expand Up @@ -389,7 +389,7 @@ func TestRemoteWalletSendFromAddress(t *testing.T) {
InnerHash: hash,
}
crtTxn, err := api.NewCreateTransactionResponse(&txn, nil)
require.Nil(t, err)
require.NoError(t, err)
crtTxn.Transaction.Fee = strconv.Itoa(sky)

mockSkyApiWalletCreateTransaction(global_mock, &wreq1, crtTxn)
Expand All @@ -402,10 +402,10 @@ func TestRemoteWalletSendFromAddress(t *testing.T) {
}

ret, err := wlt1.SendFromAddress([]core.Address{fromAddr}, []core.TransactionOutput{toAddr}, chgAddr, opt1)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, ret)
val, err := ret.ComputeFee(CoinHour)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, util.FormatCoins(uint64(sky), 10), util.FormatCoins(uint64(val), 10))
require.Equal(t, crtTxn.Transaction.TxID, ret.GetId())

Expand All @@ -416,16 +416,14 @@ func TestRemoteWalletSendFromAddress(t *testing.T) {
}

ret, err = wlt2.SendFromAddress([]core.Address{fromAddr}, []core.TransactionOutput{toAddr}, chgAddr, opt2)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, ret)
val, err = ret.ComputeFee(CoinHour)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, util.FormatCoins(uint64(sky), 10), util.FormatCoins(uint64(val), 10))
require.Equal(t, crtTxn.Transaction.TxID, ret.GetId())
}

// return createTransaction(nil, new, unspent, change, options, createTxnFunc)

func TestRemoteWalletSpend(t *testing.T) {
CleanGlobalMock()
destinationAddress := testutil.MakeAddress()
Expand Down Expand Up @@ -476,7 +474,7 @@ func TestRemoteWalletSpend(t *testing.T) {
InnerHash: hash,
}
crtTxn, err := api.NewCreateTransactionResponse(&txn, nil)
require.Nil(t, err)
require.NoError(t, err)
crtTxn.Transaction.Fee = "500"

mockSkyApiWalletCreateTransaction(global_mock, &wreq, crtTxn)
Expand All @@ -487,10 +485,10 @@ func TestRemoteWalletSpend(t *testing.T) {
}

ret, err := wlt.Spend(nil, []core.TransactionOutput{toAddr}, chgAddr, opt)
require.Nil(t, err)
require.NoError(t, err)
require.NotNil(t, ret)
val, err := ret.ComputeFee(CoinHour)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, uint64(sky), val)
require.Equal(t, crtTxn.Transaction.TxID, ret.GetId())
}
Expand Down Expand Up @@ -538,7 +536,7 @@ func TestRemoteWalletGetLoadedAddresses(t *testing.T) {
poolSection: PoolSection,
}
iter, err := wlt.GetLoadedAddresses()
require.Nil(t, err)
require.NoError(t, err)
items := 0
for iter.Next() {
a := iter.Value()
Expand Down

0 comments on commit 456d634

Please sign in to comment.