fixes and refactoring

Author: miiu96

integrationtests/accountsESDTRollback_test.go

@@ -91,7 +91,7 @@ func TestAccountsESDTDeleteOnRollback(t *testing.T) {
 	require.JSONEq(t, readExpectedResult("./testdata/accountsESDTRollback/account-after-create.json"), string(genericResponse.Docs[0].Source))
 
 	// DO ROLLBACK
-	err = esProc.RemoveAccountsESDT(5040, 2)
+	err = esProc.RemoveAccountsESDT(2, 5040000)
 	require.Nil(t, err)
 
 	err = esClient.DoMultiGet(context.Background(), ids, indexerdata.AccountsESDTIndex, true, genericResponse)

integrationtests/delegators_test.go

@@ -132,7 +132,7 @@ func TestDelegateUnDelegateAndWithdraw(t *testing.T) {
 
 	// revert unDelegate 2
 	header.TimeStamp = 5060
-	err = esProc.RemoveTransactions(header, body)
+	err = esProc.RemoveTransactions(header, body, 5060000)
 	require.Nil(t, err)
 
 	time.Sleep(time.Second)

integrationtests/logsCrossShard_test.go

@@ -208,7 +208,7 @@ func TestIndexLogSourceShardAndAfterDestinationAndAgainSource(t *testing.T) {
 		},
 	}
 
-	err = esProc.RemoveTransactions(header, body)
+	err = esProc.RemoveTransactions(header, body, header.TimeStamp*1000)
 	require.Nil(t, err)
 
 	err = esClient.DoMultiGet(context.Background(), ids, indexerdata.LogsIndex, true, genericResponse)

mock/elasticProcessorStub.go

@@ -18,13 +18,13 @@ type ElasticProcessorStub struct {
 	SaveRoundsInfoCalled             func(infos *outport.RoundsInfo) error
 	SaveShardValidatorsPubKeysCalled func(validators *outport.ValidatorsPubKeys) error
 	SaveAccountsCalled               func(accountsData *outport.Accounts) error
-	RemoveAccountsESDTCalled         func(headerTimestamp uint64) error
+	RemoveAccountsESDTCalled         func(shardID uint32, timestampMS uint64) error
 }
 
 // RemoveAccountsESDT -
-func (eim *ElasticProcessorStub) RemoveAccountsESDT(headerTimestamp uint64, _ uint32, _ uint64) error {
+func (eim *ElasticProcessorStub) RemoveAccountsESDT(shardID uint32, timestampMS uint64) error {
 	if eim.RemoveAccountsESDTCalled != nil {
-		return eim.RemoveAccountsESDTCalled(headerTimestamp)
+		return eim.RemoveAccountsESDTCalled(shardID, timestampMS)
 	}
 
 	return nil

process/dataindexer/dataIndexer.go

@@ -157,7 +157,7 @@ func (di *dataIndexer) RevertIndexedBlock(blockData *outport.BlockData) error {
 		return err
 	}
 
-	return di.elasticProcessor.RemoveAccountsESDT(header.GetTimeStamp(), header.GetShardID(), blockData.TimestampMs)
+	return di.elasticProcessor.RemoveAccountsESDT(header.GetShardID(), blockData.TimestampMs)
 }
 
 // SaveRoundsInfo will save data about a slice of rounds in elasticsearch

process/dataindexer/dataIndexer_test.go

@@ -167,7 +167,7 @@ func TestDataIndexer_RevertIndexedBlock(t *testing.T) {
 			countMap[2]++
 			return nil
 		},
-		RemoveAccountsESDTCalled: func(headerTimestamp uint64) error {
+		RemoveAccountsESDTCalled: func(_ uint32, _ uint64) error {
 			countMap[3]++
 			return nil
 		},

process/dataindexer/interface.go

@@ -16,7 +16,7 @@ type ElasticProcessor interface {
 	RemoveHeader(header coreData.HeaderHandler) error
 	RemoveMiniblocks(header coreData.HeaderHandler, body *block.Body) error
 	RemoveTransactions(header coreData.HeaderHandler, body *block.Body, uint65 uint64) error
-	RemoveAccountsESDT(headerTimestamp uint64, shardID uint32, timestampMS uint64) error
+	RemoveAccountsESDT(shardID uint32, timestampMS uint64) error
 	SaveMiniblocks(header coreData.HeaderHandler, miniBlocks []*block.MiniBlock, timestampMS uint64) error
 	SaveTransactions(outportBlockWithHeader *outport.OutportBlockWithHeader) error
 	SaveValidatorsRating(ratingData *outport.ValidatorsRating) error

process/elasticproc/elasticProcessor.go

@@ -341,11 +341,7 @@ func (ei *elasticProcessor) RemoveTransactions(header coreData.HeaderHandler, bo
 		return err
 	}
 
-	timestamp := header.GetTimeStamp()
-	if timestampMs > 0 {
-		timestamp = timestampMs
-	}
-	err = ei.removeFromIndexByTimestampAndShardID(timestamp, header.GetShardID(), elasticIndexer.EventsIndex)
+	err = ei.removeFromIndexByTimestampAndShardID(header.GetShardID(), elasticIndexer.EventsIndex, timestampMs)
 	if err != nil {
 		return err
 	}
@@ -382,23 +378,18 @@ func (ei *elasticProcessor) removeIfHashesNotEmpty(index string, hashes []string
 }
 
 // RemoveAccountsESDT will remove data from accountsesdt index and accountsesdthistory
-func (ei *elasticProcessor) RemoveAccountsESDT(headerTimestamp uint64, shardID uint32, timestampMs uint64) error {
-	timestamp := headerTimestamp
-	if timestampMs > 0 {
-		timestamp = timestampMs
-	}
-
-	err := ei.removeFromIndexByTimestampAndShardID(timestamp, shardID, elasticIndexer.AccountsESDTIndex)
+func (ei *elasticProcessor) RemoveAccountsESDT(shardID uint32, timestampMs uint64) error {
+	err := ei.removeFromIndexByTimestampAndShardID(shardID, elasticIndexer.AccountsESDTIndex, timestampMs)
 	if err != nil {
 		return err
 	}
 
-	return ei.removeFromIndexByTimestampAndShardID(timestamp, shardID, elasticIndexer.AccountsESDTHistoryIndex)
+	return ei.removeFromIndexByTimestampAndShardID(shardID, elasticIndexer.AccountsESDTHistoryIndex, timestampMs)
 }
 
-func (ei *elasticProcessor) removeFromIndexByTimestampAndShardID(headerTimestamp uint64, shardID uint32, index string) error {
+func (ei *elasticProcessor) removeFromIndexByTimestampAndShardID(shardID uint32, index string, timestampMs uint64) error {
 	ctxWithValue := context.WithValue(context.Background(), request.ContextKey, request.ExtendTopicWithShardID(request.RemoveTopic, shardID))
-	query := fmt.Sprintf(`{"query": {"bool": {"must": [{"match": {"shardID": {"query": %d,"operator": "AND"}}},{"match": {"timestamp": {"query": "%d","operator": "AND"}}}]}}}`, shardID, headerTimestamp)
+	query := fmt.Sprintf(`{"query": {"bool": {"must": [{"match": {"shardID": {"query": %d,"operator": "AND"}}},{"match": {"timestampMs": {"query": "%d","operator": "AND"}}}]}}}`, shardID, timestampMs)
 
 	return ei.elasticClient.DoQueryRemove(
 		ctxWithValue,

process/elasticproc/elasticProcessor_test.go

@@ -481,7 +481,7 @@ func TestElasticProcessor_RemoveTransactions(t *testing.T) {
 				called = true
 			} else {
 				require.Equal(t,
-					`{"query": {"bool": {"must": [{"match": {"shardID": {"query": 4294967295,"operator": "AND"}}},{"match": {"timestamp": {"query": "0","operator": "AND"}}}]}}}`,
+					`{"query": {"bool": {"must": [{"match": {"shardID": {"query": 4294967295,"operator": "AND"}}},{"match": {"timestampMs": {"query": "0","operator": "AND"}}}]}}}`,
 					body.String(),
 				)
 			}