From 241d68bc7987f89e0f78d0aac0cf0c013cab84c5 Mon Sep 17 00:00:00 2001 From: Maykel Arias Torres Date: Mon, 14 Oct 2019 23:19:09 -0400 Subject: [PATCH] [coin] refs #142 Correcting error the linter in coin --- src/coin/skycoin/main.go | 5 ++++- src/coin/skycoin/models/account.go | 5 ++++- src/coin/skycoin/models/coin.go | 5 ++++- src/coin/skycoin/models/network.go | 2 +- src/coin/skycoin/models/wallet.go | 30 ++++++++++++++++++++++++------ src/core/network.go | 2 +- 6 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/coin/skycoin/main.go b/src/coin/skycoin/main.go index b310eb73..ccee1497 100644 --- a/src/coin/skycoin/main.go +++ b/src/coin/skycoin/main.go @@ -98,6 +98,9 @@ func NewSkyFiberPlugin(params params.SkyFiberParams) core.AltcoinPlugin { func init() { cf := local.GetConfigManager() - core.GetMultiPool().CreateSection(sky.PoolSection, sky.NewSkycoinConnectionFactory(cf.GetNode())) + err := core.GetMultiPool().CreateSection(sky.PoolSection, sky.NewSkycoinConnectionFactory(cf.GetNode())) + if err != nil { + return + } util.RegisterAltcoin(NewSkyFiberPlugin(params.SkycoinMainNetParams)) } diff --git a/src/coin/skycoin/models/account.go b/src/coin/skycoin/models/account.go index 64768fc4..579a798a 100644 --- a/src/coin/skycoin/models/account.go +++ b/src/coin/skycoin/models/account.go @@ -76,7 +76,10 @@ func (addr *SkycoinAddress) ListTransactions() core.TransactionIterator { } defer ReturnSkycoinClient(c) transactions := make([]core.Transaction, 0) - txn, _ := c.TransactionsVerbose([]string{addr.String()}) + txn, err := c.TransactionsVerbose([]string{addr.String()}) + if err != nil { + return nil + } for _, tx := range txn { st := core.TXN_STATUS_PENDING diff --git a/src/coin/skycoin/models/coin.go b/src/coin/skycoin/models/coin.go index e1bde618..479df271 100644 --- a/src/coin/skycoin/models/coin.go +++ b/src/coin/skycoin/models/coin.go @@ -279,7 +279,10 @@ func (txn *SkycoinTransaction) GetStatus() core.TransactionStatus { return 0 } defer ReturnSkycoinClient(c) - txnU, _ := c.Transaction(txn.skyTxn.Hash) + txnU, err := c.Transaction(txn.skyTxn.Hash) + if err != nil { + return 0 + } if txnU.Status.Confirmed { txn.status = core.TXN_STATUS_CONFIRMED return txn.status diff --git a/src/coin/skycoin/models/network.go b/src/coin/skycoin/models/network.go index 22533e4b..825af1bf 100644 --- a/src/coin/skycoin/models/network.go +++ b/src/coin/skycoin/models/network.go @@ -63,6 +63,7 @@ type SkycoinApiClient struct { pool core.MultiPoolSection } +// nolint megacheck TODO: This functions is not used func (sc *SkycoinApiClient) returnToPool() { sc.pool.Put(sc.Client) } @@ -78,7 +79,6 @@ func NewSkycoinApiClient(section string) (SkycoinAPI, error) { if err != nil { for _, ok := err.(core.NotAvailableObjectsError); ok; _, ok = err.(core.NotAvailableObjectsError) { - obj = pool.Get() if err == nil { break } diff --git a/src/coin/skycoin/models/wallet.go b/src/coin/skycoin/models/wallet.go index b9ba4fdc..d157111d 100644 --- a/src/coin/skycoin/models/wallet.go +++ b/src/coin/skycoin/models/wallet.go @@ -140,7 +140,10 @@ func (wltSrv *SkycoinRemoteWallet) Encrypt(walletName string, pwd core.PasswordR return } defer ReturnSkycoinClient(c) - password, _ := pwd("Insert password") + password, err := pwd("Insert password") + if err != nil { + return + } _, err = c.EncryptWallet(walletName, password) if err != nil { return @@ -153,7 +156,10 @@ func (wltSrv *SkycoinRemoteWallet) Decrypt(walletName string, pwd core.PasswordR return } defer ReturnSkycoinClient(c) - password, _ := pwd("Insert password") + password, err := pwd("Insert password") + if err != nil { + return + } _, err = c.DecryptWallet(walletName, password) if err != nil { return @@ -190,7 +196,10 @@ func (wltSrv *SkycoinRemoteWallet) GetWallet(id string) core.Wallet { func NewWalletNode(nodeAddress string) *WalletNode { pool := core.GetMultiPool() - sections, _ := pool.ListSections() + sections, err := pool.ListSections() + if err != nil { + return nil + } cont := 1 var sect string for { @@ -208,7 +217,10 @@ func NewWalletNode(nodeAddress string) *WalletNode { } } - pool.CreateSection(sect, NewSkycoinConnectionFactory(nodeAddress)) + err = pool.CreateSection(sect, NewSkycoinConnectionFactory(nodeAddress)) + if err != nil { + return nil + } return &WalletNode{ NodeAddress: nodeAddress, poolSection: sect, @@ -345,7 +357,10 @@ func (wlt *RemoteWallet) SetLabel(name string) { return } defer ReturnSkycoinClient(c) - _ = c.UpdateWallet(wlt.Id, name) + err = c.UpdateWallet(wlt.Id, name) + if err != nil { + return + } } func (wlt *RemoteWallet) GetId() string { @@ -517,7 +532,10 @@ func (wlt *RemoteWallet) GenAddresses(addrType core.AddressType, startIndex, cou return nil } defer ReturnSkycoinClient(c) - password, _ := pwd("Insert password") + password, err := pwd("Insert password") + if err != nil { + return nil + } wltR, err := c.Wallet(wlt.Id) if err != nil { return nil diff --git a/src/core/network.go b/src/core/network.go index 4e649f0f..346e696b 100644 --- a/src/core/network.go +++ b/src/core/network.go @@ -135,7 +135,7 @@ func (ps *PoolSection) Put(obj interface{}) { func newMultiConnectionPool(capacity int) *MultiConnectionsPool { return &MultiConnectionsPool{ capacity: capacity, - sections: make(map[string]*PoolSection, 0), + sections: make(map[string]*PoolSection), } } func GetMultiPool() MultiPool {