Skip to content

Commit

Permalink
[test] refs #279 - Remove unnecessary nolint in tests
Browse files Browse the repository at this point in the history
  • Loading branch information
e1Ru1o committed Jan 24, 2020
1 parent 52a962f commit c5d7769
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 21 deletions.
18 changes: 9 additions & 9 deletions src/coin/skycoin/models/account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
}

Expand Down
4 changes: 2 additions & 2 deletions src/coin/skycoin/models/blockchain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion src/coin/skycoin/models/coin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -786,7 +786,8 @@ func Test_serializeCreatedTransaction(t *testing.T) {
}

func TestSkycoinPendingTransactionEncodeSkycoinTransaction(t *testing.T) {
date, _ := time.Parse(time.RFC3339, "2012-11-01T22:08:41+00:00")
date, err := time.Parse(time.RFC3339, "2012-11-01T22:08:41+00:00")
require.NoError(t, err)
sTxn := &SkycoinPendingTransaction{
Transaction: &readable.UnconfirmedTransactionVerbose{
Transaction: readable.BlockTransactionVerbose{
Expand Down
21 changes: 14 additions & 7 deletions src/coin/skycoin/models/wallet_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1704,9 +1704,11 @@ func TestSkycoinLocalWalletEncrypt(t *testing.T) {
clean := err == nil

tt.srv.Encrypt(tt.name, tt.pwd)
encrypted, _ := tt.srv.IsEncrypted(tt.name) // nolint gosec
encrypted, err := tt.srv.IsEncrypted(tt.name)
require.NoError(t, err)
if clean {
_ = wallet.Save(wlt, tt.srv.walletDir) // nolint gosec
err = wallet.Save(wlt, tt.srv.walletDir)
require.NoError(t, err)
}
require.Equal(t, tt.valid, encrypted)
})
Expand Down Expand Up @@ -1739,9 +1741,11 @@ func TestSkycoinLocalWalletDecrypt(t *testing.T) {
clean := err == nil

tt.srv.Decrypt(tt.name, tt.pwd)
encrypted, _ := tt.srv.IsEncrypted(tt.name) // nolint gosec
encrypted, err := tt.srv.IsEncrypted(tt.name)
require.NoError(t, err)
if clean {
_ = wallet.Save(wlt, tt.srv.walletDir) // nolint gosec
err = wallet.Save(wlt, tt.srv.walletDir)
require.NoError(t, err)
}
require.Equal(t, tt.valid, encrypted)
})
Expand Down Expand Up @@ -1786,7 +1790,8 @@ func TestWalletsReadyForTxn(t *testing.T) {
mock.AnythingOfType("*mocks.Transaction"),
).Return(
func(w core.Wallet, txn core.Transaction) bool {
ok, _ := checkTxnSupported(mockWlt, w, txn) // nolint gosec
ok, err := checkTxnSupported(mockWlt, w, txn)
require.NoError(t, err)
return ok
},
nil,
Expand Down Expand Up @@ -1948,8 +1953,10 @@ func TestSeedServiceGenerateMnemonic(t *testing.T) {

func TestSeedServiceVerifyMnemonic(t *testing.T) {
srv := new(SeedService)
mnc128, _ := srv.GenerateMnemonic(128) // nolint gosec
mnc256, _ := srv.GenerateMnemonic(256) // nolint gosec
mnc128, err := srv.GenerateMnemonic(128)
require.NoError(t, err)
mnc256, err := srv.GenerateMnemonic(256)
require.NoError(t, err)
tests := []struct {
name string
mnemonic string
Expand Down
4 changes: 2 additions & 2 deletions src/util/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestPubKeyFromBytes(t *testing.T) {
require.Nil(t, err)
require.Equal(t, pubKey, mockPubKey)

_, err = PubKeyFromBytes(`CUSTOMTICKER`, bytes) // nolint gosec
_, err = PubKeyFromBytes(`CUSTOMTICKER`, bytes)
require.NotNil(t, err)
}

Expand Down Expand Up @@ -65,6 +65,6 @@ func TestSecKeyFromBytes(t *testing.T) {
require.Nil(t, err)
require.Equal(t, secKey, mockSecKey)

_, err = SecKeyFromBytes(`CUSTOMTICKER`, bytes) // nolint gosec
_, err = SecKeyFromBytes(`CUSTOMTICKER`, bytes)
require.NotNil(t, err)
}

0 comments on commit c5d7769

Please sign in to comment.