Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixes #279 Continue improving coverage #320

Merged
merged 89 commits into from
Feb 4, 2020
Merged
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
f03d126
[ui] refs #298 - Add Radio Buttons to select log output destination a…
AntiD2ta Jan 4, 2020
0364ad1
[config] refs #298 - Add default configuration for log level
AntiD2ta Jan 4, 2020
0b39a01
[ui] refs #298 - Add config option for log level
AntiD2ta Jan 4, 2020
b956f08
[main] [config] refs #298 - Add log level settings
AntiD2ta Jan 5, 2020
7fbc7a7
[ui] refs #298 - Add TextField for log Level
AntiD2ta Jan 5, 2020
2346a76
Merge branch 'develop' into stdevAntiD2ta_t298_Log_events_to_file
AntiD2ta Jan 18, 2020
9cf37c9
[util] refs #298 - Keep references of packages loggers
AntiD2ta Jan 18, 2020
9cad3e2
[settings] Add log level as an independent option
mauricio1802 Jan 18, 2020
a693890
[ui] refs #298 - Change path to log level configuration
AntiD2ta Jan 18, 2020
9b97156
[util] refs #298 - Add function to set log's output to a file
AntiD2ta Jan 18, 2020
85f0c7e
[util] refs #298 - Add some changes to logging package
AntiD2ta Jan 19, 2020
74e7cdd
[config] refs #298 - Add configuration option for log's output
AntiD2ta Jan 19, 2020
fca2d43
[main] refs #298 - Set log's output correctly given option in settings
AntiD2ta Jan 19, 2020
9ea9df3
[ui] refs #298 - Add ui to set log's output in Settings
AntiD2ta Jan 19, 2020
8f7bc72
[ui] - Remove unnecessary qml log
AntiD2ta Jan 19, 2020
4ded230
[logging] refs #298 - Create Writer for none option
AntiD2ta Jan 20, 2020
8bb88cb
[logging] refs #298 - Add stderr and none options to SetOutput
AntiD2ta Jan 20, 2020
f4215c5
[config] refs #298 - Change default value for log's output to none
AntiD2ta Jan 20, 2020
f313996
[models] refs #298 - Apply changed settings related to logs when they…
AntiD2ta Jan 20, 2020
c053490
[gitignore] - Ignore .log extensions
AntiD2ta Jan 20, 2020
a2b05a3
[logging] refs #298 - Refactorize code
AntiD2ta Jan 21, 2020
512ec7a
[skycoin] [models] refs #298 - Change output of SkycoinProject's logger
AntiD2ta Jan 21, 2020
40b6449
[main] - Handle unmarshaling node settings error
AntiD2ta Jan 21, 2020
3bf565f
[makefile] - Improve test-core rule to have a coverage profile
AntiD2ta Jan 21, 2020
2cfd783
[logging] refs #298 - Change permissions of file for logs to 0600
AntiD2ta Jan 21, 2020
99a2875
Merge remote-tracking branch 'simelo_alt/stdevRulo_t279_improve_cover…
olemis Jan 22, 2020
6803f10
[config] - Add logs to package config
AntiD2ta Jan 22, 2020
6e4c5c1
[models] - Add logs to config view model
AntiD2ta Jan 22, 2020
fac268e
[logging] - Fix bug
AntiD2ta Jan 22, 2020
10e5cb0
[logging] refs #298 - Add initial tests for logging package
AntiD2ta Jan 22, 2020
9ca97e0
Merge remote-tracking branch 'simelo/stdevAntiD2ta_t298_Log_events_to…
AntiD2ta Jan 22, 2020
04159e1
Merge branch 'stdevRulo_t279_improve_coverage' into stdevAntiD2ta_t29…
AntiD2ta Jan 22, 2020
9e13d3f
[test] - Solve ineffectual assignments to `val`
AntiD2ta Jan 22, 2020
ee944a6
[test] - Solve assignment to val variable problem
AntiD2ta Jan 22, 2020
03ba11f
[test] - Amend incorrect path to a directory
AntiD2ta Jan 23, 2020
7334734
[test] - Solve ineffectual assignment to `val`
AntiD2ta Jan 23, 2020
4ef8650
Merge remote-tracking branch 'fc/develop' into stdevAntiD2ta_t298_Log…
olemis Jan 23, 2020
1651c5f
[view] refs #298 - Remove initial implementation of log level Combo Box
AntiD2ta Jan 23, 2020
1dd6f19
[test] refs #279 - Add `TestPendingTxnGetTimestamp`
e1Ru1o Jan 23, 2020
30ddee1
[test] refs #279 - Add `TestPendingTxnGetInputs`
e1Ru1o Jan 23, 2020
59c146e
[test] refs #279 - Add `TestPendingTxnGetOutputs`
e1Ru1o Jan 23, 2020
b3ff4d2
[test] refs #279 - Add `TestPendingTxnGetId`
e1Ru1o Jan 23, 2020
0cc68dc
[test] refs #279 - Add `TestPendingTxnComputeFee`
e1Ru1o Jan 23, 2020
6f4b426
[test] refs #279 - Adding 4 new test
e1Ru1o Jan 24, 2020
81d34da
[test] refs #298 - Fix linter errors
AntiD2ta Jan 24, 2020
90f05ac
[pending][test] refs #279 - Change `SkycoinPendingTransaction` structure
e1Ru1o Jan 24, 2020
b4b841a
[test] refs #279 - Add `TestPendingTxnToCreatedTransaction`
e1Ru1o Jan 24, 2020
e95ee2c
[test] refs #279 - Add `Test_serializeCreatedTransaction`
e1Ru1o Jan 24, 2020
52a962f
[test] refs #279 - Add `TestSkycoinPendingTransactionEncodeSkycoinTra…
e1Ru1o Jan 24, 2020
c5d7769
[test] refs #279 - Remove unnecessary nolint in tests
e1Ru1o Jan 24, 2020
1b9ece0
[test] refs #279 - Fix error catching in `TestSkycoinLocalWalletDecry…
e1Ru1o Jan 24, 2020
6d9c2bf
[coin] - Fix error in `verifyReadableTransaction`
e1Ru1o Jan 24, 2020
0afd019
[test] refs #279 - Add `Test_verifyReadableTransaction`
e1Ru1o Jan 24, 2020
8d2f444
[test] refs #279 - Add `TestPendingTxnVerifySignature`
e1Ru1o Jan 24, 2020
91b2ca4
Merge pull request #317 from simelo/stdevAntiD2ta_t298_Log_events_to_…
olemis Jan 25, 2020
210e1bf
[test] refs #279 - Add `Test_checkFullySigned`
e1Ru1o Jan 25, 2020
0741746
[test] refs #279 - Add `TestPendingTxnIsFullySigned`
e1Ru1o Jan 25, 2020
2a6ccdc
[test] refs #279 - Update `TestSkycoinUninjectedTransactionGetInputs`
e1Ru1o Jan 25, 2020
8e3f78c
[test] refs #279 - Add `TestSkycoinUninjectedTransactionGetOutputs`
e1Ru1o Jan 25, 2020
9ffcc12
[test] refs #279 - Add `TestSkycoinUninjectedTransactionGetId`
e1Ru1o Jan 25, 2020
9f54463
[test] refs #279 - Add `TestTransactionsGetTimestamp`
e1Ru1o Jan 25, 2020
df23699
[test] refs #279 - Add `TestTransactionGetStatus`
e1Ru1o Jan 25, 2020
f8c9d42
[test] refs #279 - Update `TestTransactionGetStatus`
e1Ru1o Jan 25, 2020
ab0c686
[test] refs #279 - Update `TestSkycoinTransactionGetInputs`
e1Ru1o Jan 25, 2020
543a6fa
[test] refs #279 - Add 2 test
e1Ru1o Jan 26, 2020
30953e4
[test] refs #279 - Add `TestTransactionIsFullySigned`
e1Ru1o Jan 26, 2020
b8a6817
[test] refs #279 - Add 2 test
e1Ru1o Jan 26, 2020
eaad386
[test] refs #279 - Add `Test_getSkycoinTransactionInputsFromTxnHash`
e1Ru1o Jan 26, 2020
271e507
[test] refs #279 - Update `TestSkycoinTransactionInputGetSpentOutput`
e1Ru1o Jan 26, 2020
132ea87
[test] refs #279 - Add `TestSkycoinTransactionInputGetCoins`
e1Ru1o Jan 26, 2020
1323485
[test] refs #279 - Add `TestSkycoinTransactionOutputGetAddress`
e1Ru1o Jan 26, 2020
c325bd5
[test] refs #279 - Change `TestSkycoinTransactionInputGetCoins` to `T…
e1Ru1o Jan 26, 2020
ab7ee72
[test] refs #279 - Update `TestSkycoinTransactionOutputIsSpent`
e1Ru1o Jan 26, 2020
d078ba0
[test] refs #279 - Add `TestGet`
e1Ru1o Jan 26, 2020
433b569
[test] refs #279 - Update `TestGetCoins`
e1Ru1o Jan 26, 2020
2a1328c
[test] refs #279 - Add `TestSkycoinCreatedTransactionInputGetSpentOut…
e1Ru1o Jan 26, 2020
52f4f55
[test] refs #279 - Update `GetId`
e1Ru1o Jan 26, 2020
772067c
[test] refs #279 - Add generic `TestGetAddress`
e1Ru1o Jan 26, 2020
7982622
[test] refs #279 - Add generic `TestIsSpent`
e1Ru1o Jan 26, 2020
f6a1552
[test] refs #279 - Integrate `SkycoinCreatedTransaction` into tests
e1Ru1o Jan 26, 2020
49f3717
[test] refs #279 - Add generic `TestEncodeSkycoinTransaction`
e1Ru1o Jan 26, 2020
595a1c4
[test] refs #279 - Add `TestNewWalletNode`
e1Ru1o Jan 26, 2020
fd72907
[test] refs #279 - `GetCoins` implementations full covered
e1Ru1o Jan 26, 2020
8b89c40
Merge remote-tracking branch 'simelo_alt/stdevRulo_t279_improve_cover…
olemis Jan 28, 2020
88ccf96
[mocks] refs #279 - Mocks for Skycoin-specific interfaces do not belo…
olemis Feb 3, 2020
022e5f6
[ci] refs #279 - Factor gen-mocks-core out of gen-mocks Makefile target
olemis Feb 3, 2020
d830024
[ci] refs #279 - Generate mocks for internal interfaces of Dkycoin al…
olemis Feb 3, 2020
cf6ce80
[mocks] refs #279 - Generate mocks for address book interface types
olemis Feb 3, 2020
081e56a
[sky] refs #279 - Generate mocks for Skycoin altcoin plugin
olemis Feb 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/coin/mocks/ReadableTxn.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/coin/skycoin/models/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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
}
Expand Down
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
6 changes: 2 additions & 4 deletions src/coin/skycoin/models/coin.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -639,7 +639,6 @@ func (in *SkycoinTransactionInput) GetCoins(ticker string) (uint64, error) {
} else if ticker == CalculatedHour {
return in.skyIn.CalculatedHours * accuracy, nil
}
// TODO: The program never reach here because util.AltcoinQuotient(ticker) throws an error when a invalid ticker is supplied
logCoin.Errorf("Invalid ticker %v\n", ticker)
return uint64(0), errors.ErrInvalidAltcoinTicker
}
Expand Down Expand Up @@ -720,7 +719,6 @@ func (out *SkycoinTransactionOutput) GetCoins(ticker string) (uint64, error) {
} else if ticker == CalculatedHour {
return out.calculatedHours * accuracy, nil
}
// TODO: The program never reach here because util.AltcoinQuotient(ticker) throws an error when a invalid ticker is supplied
logCoin.Errorf("Invalid ticker %v\n", ticker)
return uint64(0), errors.ErrInvalidAltcoinTicker
}
Expand Down
Loading