Skip to content

Commit

Permalink
fixed linter issues - partial
Browse files Browse the repository at this point in the history
  • Loading branch information
0xmtf committed Jan 20, 2021
1 parent 2deee17 commit 49edeaf
Show file tree
Hide file tree
Showing 24 changed files with 64 additions and 76 deletions.
2 changes: 1 addition & 1 deletion cmd/storer2elastic/databasereader/databaseReader.go
Expand Up @@ -188,7 +188,7 @@ func (dr *databaseReader) GetStaticDatabaseInfo() ([]*DatabaseInfo, error) {
if dbs[i].Epoch < dbs[j].Epoch {
return true
}
if dbs[i].Epoch > dbs[i].Epoch {
if dbs[i].Epoch > dbs[j].Epoch {
return false
}

Expand Down
40 changes: 20 additions & 20 deletions cmd/storer2elastic/dataprocessor/dataReplayer.go
Expand Up @@ -161,9 +161,9 @@ func (dr *dataReplayer) startIndexing(errChan chan error, persistedDataHandler f
}

func (dr *dataReplayer) processMetaChainDatabase(
record *databasereader.DatabaseInfo,
dbsInfo []*databasereader.DatabaseInfo,
persistedDataHandler func(persistedData storer2ElasticData.RoundPersistedData) bool,
record *databasereader.DatabaseInfo,
dbsInfo []*databasereader.DatabaseInfo,
persistedDataHandler func(persistedData storer2ElasticData.RoundPersistedData) bool,
) error {
metaHeadersPersisters, err := dr.prepareMetaPersistersHolder(record)
if err != nil {
Expand Down Expand Up @@ -303,10 +303,10 @@ func (dr *dataReplayer) getMetaBlockForNonce(nonce uint64, metaPersisters *metaB
}

func (dr *dataReplayer) processMetaBlock(
metaBlock *block.MetaBlock,
dbsInfo []*databasereader.DatabaseInfo,
persisters *persistersHolder,
shardPersisters map[uint32]*persistersHolder,
metaBlock *block.MetaBlock,
dbsInfo []*databasereader.DatabaseInfo,
persisters *persistersHolder,
shardPersisters map[uint32]*persistersHolder,
) (*storer2ElasticData.RoundPersistedData, error) {
metaHdrData, err := dr.processHeader(persisters, metaBlock)
if err != nil {
Expand All @@ -332,10 +332,10 @@ func (dr *dataReplayer) processMetaBlock(
}

func (dr *dataReplayer) processShardInfo(
dbsInfos []*databasereader.DatabaseInfo,
shardInfo *block.ShardData,
epoch uint32,
shardPersisters *persistersHolder,
dbsInfos []*databasereader.DatabaseInfo,
shardInfo *block.ShardData,
epoch uint32,
shardPersisters *persistersHolder,
) (*storer2ElasticData.HeaderData, error) {
shardHeader, err := dr.getShardHeader(shardPersisters, shardInfo.HeaderHash)
if err != nil {
Expand Down Expand Up @@ -369,8 +369,8 @@ func (dr *dataReplayer) getAndProcessFromShardStorer(dbsInfos []*databasereader.
}

func (dr *dataReplayer) getShardHeader(
shardPersisters *persistersHolder,
hash []byte,
shardPersisters *persistersHolder,
hash []byte,
) (*block.Header, error) {
shardHeaderBytes, err := shardPersisters.shardHeadersPersister.Get(hash)
if err != nil {
Expand Down Expand Up @@ -405,9 +405,9 @@ func (dr *dataReplayer) getShardIDs() []uint32 {
}

func (dr *dataReplayer) processBodyAndTransactionsPoolForHeader(
header data.HeaderHandler,
persisters *persistersHolder,
mbHashes [][]byte,
header data.HeaderHandler,
persisters *persistersHolder,
mbHashes [][]byte,
) (*block.Body, map[string]data.TransactionHandler, error) {
txPool := make(map[string]data.TransactionHandler)
mbUnit := persisters.miniBlocksPersister
Expand Down Expand Up @@ -500,10 +500,10 @@ func (dr *dataReplayer) getMiniBlockFromStorage(mbUnit storage.Persister, mbHash
}

func (dr *dataReplayer) processTransactionsForMiniBlock(
persisters *persistersHolder,
txHashes [][]byte,
txPool map[string]data.TransactionHandler,
mbType block.Type,
persisters *persistersHolder,
txHashes [][]byte,
txPool map[string]data.TransactionHandler,
mbType block.Type,
) error {
for _, txHash := range txHashes {
var tx data.TransactionHandler
Expand Down
4 changes: 2 additions & 2 deletions data/state/accountsDB_test.go
Expand Up @@ -494,7 +494,7 @@ func TestAccountsDB_GetAccountAccountNotFound(t *testing.T) {
t.Parallel()

trieMock := mock.TrieStub{}
adr, _, adb := generateAddressAccountAccountsDB(&mock.TrieStub{})
adr, _, _ := generateAddressAccountAccountsDB(&mock.TrieStub{})

//Step 1. Create an account + its DbAccount representation
testAccount := mock.NewAccountWrapMock(adr)
Expand All @@ -510,7 +510,7 @@ func TestAccountsDB_GetAccountAccountNotFound(t *testing.T) {
return buff, nil
}

adb, _ = state.NewAccountsDB(&trieMock, &mock.HasherMock{}, &marshalizer, &mock.AccountsFactoryStub{
adb, _ := state.NewAccountsDB(&trieMock, &mock.HasherMock{}, &marshalizer, &mock.AccountsFactoryStub{
CreateAccountCalled: func(address []byte) (state.AccountHandler, error) {
return mock.NewAccountWrapMock(address), nil
},
Expand Down
6 changes: 0 additions & 6 deletions data/trie/trieStorageManager.go
Expand Up @@ -374,12 +374,6 @@ func (tsm *trieStorageManager) SetCheckpoint(rootHash []byte) {

func (tsm *trieStorageManager) writeOnChan(entry *snapshotsQueueEntry) {
tsm.snapshotReq <- entry

// TODO:
//select {
//case tsm.snapshotReq <- entry:
// return
//}
}

func (tsm *trieStorageManager) takeSnapshot(snapshot *snapshotsQueueEntry, msh marshal.Marshalizer, hsh hashing.Hasher) {
Expand Down
4 changes: 2 additions & 2 deletions dataRetriever/storageResolvers/storageResolver_test.go
Expand Up @@ -73,7 +73,7 @@ func TestStorageResolver_signalGracefullyCloseCanNotWriteOnChanShouldNotPanic(t
}
}()

chanClose := make(chan endProcess.ArgEndProcess, 0)
chanClose := make(chan endProcess.ArgEndProcess)
sr := &storageResolver{
chanGracefullyClose: chanClose,
manualEpochStartNotifier: &mock.ManualEpochStartNotifierStub{
Expand All @@ -98,7 +98,7 @@ func TestStorageResolver_signalGracefullyCloseDoubleSignalShouldNotPanic(t *test
}
}()

chanClose := make(chan endProcess.ArgEndProcess, 0)
chanClose := make(chan endProcess.ArgEndProcess)
sr := &storageResolver{
chanGracefullyClose: chanClose,
manualEpochStartNotifier: &mock.ManualEpochStartNotifierStub{
Expand Down
2 changes: 1 addition & 1 deletion epochStart/metachain/baseRewards_test.go
Expand Up @@ -254,7 +254,7 @@ func TestBaseRewardsCreator_addProtocolRewardToMiniblocks(t *testing.T) {
found := false
for _, mb := range mbSlice {
for _, txHash := range mb.TxHashes {
if bytes.Compare(txHash, protRwTxHash) == 0 {
if bytes.Equal(txHash, protRwTxHash) {
found = true
}
}
Expand Down
16 changes: 8 additions & 8 deletions epochStart/metachain/rewardsV2_test.go
Expand Up @@ -167,7 +167,7 @@ func TestNewRewardsCreatorV2_getTopUpForAllEligibleSomeBLSKeysNotFoundZeroed(t *
notFoundKey := []byte("notFound")
args.StakingDataProvider = &mock.StakingDataProviderStub{
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
if bytes.Compare(blsKey, notFoundKey) == 0 {
if bytes.Equal(blsKey, notFoundKey) {
return nil, fmt.Errorf("not found")
}
topUp := big.NewInt(0).Set(topUpVal)
Expand Down Expand Up @@ -621,7 +621,7 @@ func TestNewRewardsCreatorV2_computeTopUpRewardsPerNode(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -755,7 +755,7 @@ func TestNewRewardsCreatorV2_computeRewardsPerNode(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -876,7 +876,7 @@ func TestNewRewardsCreatorV2_computeRewardsPer2169Nodes(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -999,7 +999,7 @@ func TestNewRewardsCreatorV2_computeRewardsPer1920Nodes(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -1118,7 +1118,7 @@ func TestNewRewardsCreatorV2_computeRewardsPer3200Nodes(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -1350,7 +1350,7 @@ func TestNewRewardsCreatorV2_CreateRewardsMiniBlocks(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down Expand Up @@ -1447,7 +1447,7 @@ func TestNewRewardsCreatorV2_CreateRewardsMiniBlocks2169Nodes(t *testing.T) {
GetNodeStakedTopUpCalled: func(blsKey []byte) (*big.Int, error) {
for shardID, vList := range vInfo {
for i, v := range vList {
if bytes.Compare(v.PublicKey, blsKey) == 0 {
if bytes.Equal(v.PublicKey, blsKey) {
return nodesRewardInfo[shardID][i].topUpStake, nil
}
}
Expand Down
6 changes: 3 additions & 3 deletions epochStart/metachain/rewards_test.go
Expand Up @@ -330,7 +330,7 @@ func TestRewardsCreator_adjustProtocolSustainabilityRewardsInitialNegativeValue(

protRwShard := args.ShardCoordinator.ComputeId(protRwAddr)
mbSlice := createDefaultMiniBlocksSlice()
_ = rwd.addProtocolRewardToMiniBlocks(protRwTx, mbSlice, protRwShard) // TODO: ignore or assert not nil
_ = rwd.addProtocolRewardToMiniBlocks(protRwTx, mbSlice, protRwShard)

rwd1 := rewardsCreator{
baseRewardsCreator: rwd,
Expand Down Expand Up @@ -599,7 +599,7 @@ func TestRewardsCreator_addValidatorRewardsToMiniBlocks(t *testing.T) {
miniBlocks[0].Type = block.RewardsBlock
miniBlocks[0].TxHashes = make([][]byte, 0)

cloneMb := &(*miniBlocks[0])
cloneMb := *miniBlocks[0]
cloneMb.TxHashes = make([][]byte, 0)
expectedRwdTx := &rewardTx.RewardTx{
Round: 0,
Expand Down Expand Up @@ -714,7 +714,7 @@ func TestRewardsCreator_AddProtocolSustainabilityRewardToMiniBlocks(t *testing.T
miniBlocks[0].Type = block.RewardsBlock
miniBlocks[0].TxHashes = make([][]byte, 0)

cloneMb := &(*miniBlocks[0])
cloneMb := miniBlocks[0]
cloneMb.TxHashes = make([][]byte, 0)
expectedRewardTx := &rewardTx.RewardTx{
Round: 0,
Expand Down
2 changes: 1 addition & 1 deletion epochStart/metachain/stakingDataProvider_test.go
Expand Up @@ -247,7 +247,7 @@ func TestStakingDataProvider_ComputeUnQualifiedNodesWithOwnerNotEnoughFunds(t *t
sdp.cache[keyOfAddressWaitingShard0].totalStaked = big.NewInt(400)

for id, val := range sdp.cache {
fmt.Println(fmt.Sprintf("id: %s, num bls keys: %d", id, len(val.blsKeys)))
fmt.Printf("id: %s, num bls keys: %d\n", id, len(val.blsKeys))
}

keysToUnStake, ownersWithNotEnoughFunds, err := sdp.ComputeUnQualifiedNodes(valInfo)
Expand Down
4 changes: 2 additions & 2 deletions fallback/headerValidator_test.go
Expand Up @@ -120,7 +120,7 @@ func TestShouldApplyFallbackConsensus_ShouldReturnFalseWhenRoundIsNotTooOld(t *t
prevHash := []byte("prev_hash")
headersPool := &mock.HeadersCacherStub{
GetHeaderByHashCalled: func(hash []byte) (data.HeaderHandler, error) {
if bytes.Compare(hash, prevHash) == 0 {
if bytes.Equal(hash, prevHash) {
return &block.MetaBlock{}, nil
}
return nil, errors.New("error")
Expand Down Expand Up @@ -149,7 +149,7 @@ func TestShouldApplyFallbackConsensus_ShouldReturnTrue(t *testing.T) {
prevHash := []byte("prev_hash")
headersPool := &mock.HeadersCacherStub{
GetHeaderByHashCalled: func(hash []byte) (data.HeaderHandler, error) {
if bytes.Compare(hash, prevHash) == 0 {
if bytes.Equal(hash, prevHash) {
return &block.MetaBlock{}, nil
}
return nil, errors.New("error")
Expand Down
Expand Up @@ -362,7 +362,7 @@ func verifyRewardsForShards(
totalFees.Mul(totalFees, big.NewInt(0).SetUint64(uint64(feePerTxForLeader)))

expectedBalance.Add(expectedBalance, totalFees)
fmt.Println(fmt.Sprintf("checking account %s has balance %d", acc.AddressBytes(), expectedBalance))
fmt.Printf("checking account %s has balance %d\n", acc.AddressBytes(), expectedBalance)
assert.Equal(t, expectedBalance, acc.(state.UserAccountHandler).GetBalance())
}
}
Expand Down
3 changes: 1 addition & 2 deletions integrationTests/multiShard/txScenarios/scCalls_test.go
Expand Up @@ -84,8 +84,7 @@ func TestTransaction_TransactionSCScenarios(t *testing.T) {
assert.Equal(t, expectedBalance, senderAccount.GetBalance())

//deploy should work gas used should be greater than estimation and small that all gas provided
var gasUsed uint64
gasUsed = nodes[0].EconomicsData.ComputeGasLimit(tx3)
gasUsed := nodes[0].EconomicsData.ComputeGasLimit(tx3)
txFee = big.NewInt(0).Mul(big.NewInt(0).SetUint64(gasUsed), big.NewInt(0).SetUint64(integrationTests.MinTxGasPrice))
expectedBalance = big.NewInt(0).Sub(initialBalance, txFee)

Expand Down
2 changes: 1 addition & 1 deletion integrationTests/p2p/pubsub/peerReceivingMessages_test.go
Expand Up @@ -106,7 +106,7 @@ func TestPeerReceivesTheSameMessageMultipleTimesShouldNotHappen(t *testing.T) {
for _, p := range peers {
err = p.Bootstrap()
if err != nil {
fmt.Println(fmt.Sprintf("Bootstrap() for peer id %s failed:%s", p.ID(), err.Error()))
fmt.Printf("Bootstrap() for peer id %s failed:%s\n", p.ID(), err.Error())
}
}
integrationTests.WaitForBootstrapAndShowConnected(peers, integrationTests.P2pBootstrapDelay)
Expand Down
6 changes: 3 additions & 3 deletions node/totalStakedAPI/totalStakedValueProcessor_test.go
Expand Up @@ -172,7 +172,7 @@ func TestTotalStakedValueProcessor_GetTotalStakedValue_ShouldWork(t *testing.T)
ch := make(chan core.KeyValueHolder)

go func() {
trieLeaf := keyValStorage.NewKeyValStorage(append(rootHash), append(marshalledData, suffix...))
trieLeaf := keyValStorage.NewKeyValStorage(rootHash, append(marshalledData, suffix...))
ch <- trieLeaf
close(ch)
}()
Expand Down Expand Up @@ -214,7 +214,7 @@ func TestTotalStakedValueProcessor_GetTotalStakedValue_ValueChange(t *testing.T)
ch := make(chan core.KeyValueHolder)

go func() {
trieLeaf := keyValStorage.NewKeyValStorage(append(rootHash), append(marshalledData, suffix...))
trieLeaf := keyValStorage.NewKeyValStorage(rootHash, append(marshalledData, suffix...))
ch <- trieLeaf
close(ch)
}()
Expand Down Expand Up @@ -247,7 +247,7 @@ func TestTotalStakedValueProcessor_GetTotalStakedValue_ValueChange(t *testing.T)
ch := make(chan core.KeyValueHolder)

go func() {
trieLeaf := keyValStorage.NewKeyValStorage(append(rootHash), append(marshalledData, suffix...))
trieLeaf := keyValStorage.NewKeyValStorage(rootHash, append(marshalledData, suffix...))
ch <- trieLeaf
close(ch)
}()
Expand Down
2 changes: 1 addition & 1 deletion p2p/example/libp2p/chatAdvertiser/main.go
Expand Up @@ -112,7 +112,7 @@ func main() {
stream, err = host.NewStream(ctx, peer.ID, protocol.ID(protocolID))

if err != nil {
logger.Warning("Connection failed:", err)
logger.Warn("Connection failed:", err)
continue
} else {
rw := bufio.NewReadWriter(bufio.NewReader(stream), bufio.NewWriter(stream))
Expand Down
4 changes: 2 additions & 2 deletions p2p/example/libp2p/chatPeer/main.go
Expand Up @@ -137,7 +137,7 @@ func main() {
go func() {
defer wg.Done()
if err = host.Connect(ctx, *peerinfo); err != nil {
logger.Warning(err)
logger.Warn(err)
} else {
logger.Info("Connection established with bootstrap node:", *peerinfo)
}
Expand Down Expand Up @@ -171,7 +171,7 @@ func main() {
stream, err = host.NewStream(ctx, p.ID, protocol.ID(protocolID))

if err != nil {
logger.Warning("Connection failed:", err)
logger.Warn("Connection failed:", err)
continue
} else {
rw := bufio.NewReadWriter(bufio.NewReader(stream), bufio.NewWriter(stream))
Expand Down
2 changes: 1 addition & 1 deletion p2p/issues/pubsub_349/main.go
Expand Up @@ -23,7 +23,7 @@ type messenger struct {
}

func newMessenger() *messenger {
address := fmt.Sprintf("/ip4/0.0.0.0/tcp/0")
address := "/ip4/0.0.0.0/tcp/0"
opts := []libp2p.Option{
libp2p.ListenAddrStrings(address),
libp2p.Identity(createP2PPrivKey()),
Expand Down
3 changes: 1 addition & 2 deletions process/scToProtocol/stakingToPeer_test.go
Expand Up @@ -690,8 +690,7 @@ func TestStakingToPeer_UpdatePeerState(t *testing.T) {
func TestStakingToPeer_UnJailFromInactive(t *testing.T) {
t.Parallel()

var peerAccount state.PeerAccountHandler
peerAccount = state.NewEmptyPeerAccount()
peerAccount := state.NewEmptyPeerAccount()
peerAccountsDB := &mock.AccountsStub{
LoadAccountCalled: func(address []byte) (state.AccountHandler, error) {
return peerAccount, nil
Expand Down
2 changes: 1 addition & 1 deletion process/track/metaBlockTrack.go
Expand Up @@ -92,7 +92,7 @@ func (mbt *metaBlockTrack) GetSelfHeaders(headerHandler data.HeaderHandler) []*H
func (mbt *metaBlockTrack) getTrackedMetaBlockWithHash(hash []byte) (*block.MetaBlock, error) {
metaBlocks, metaBlocksHashes := mbt.GetTrackedHeaders(core.MetachainShardId)
for i := 0; i < len(metaBlocks); i++ {
if bytes.Compare(metaBlocksHashes[i], hash) != 0 {
if !bytes.Equal(metaBlocksHashes[i], hash) {
continue
}

Expand Down
2 changes: 1 addition & 1 deletion process/track/shardBlockTrack.go
Expand Up @@ -101,7 +101,7 @@ func (sbt *shardBlockTrack) getTrackedShardHeaderWithNonceAndHash(

headers, headersHashes := sbt.GetTrackedHeadersWithNonce(shardID, nonce)
for i := 0; i < len(headers); i++ {
if bytes.Compare(headersHashes[i], hash) != 0 {
if !bytes.Equal(headersHashes[i], hash) {
continue
}

Expand Down

0 comments on commit 49edeaf

Please sign in to comment.