Merge pull request #330 from multiversx/update-spica-patch

Update spica patch

Author: miiu96

.github/workflows/pr-integration-tests.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Run integration tests with Elasticsearch `v7.17.8`
         run: make integration-tests ES_VERSION=7.17.8
   test-2:
-    name: Elasticsearch v8.6.0
+    name: Elasticsearch v8.16.0
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
@@ -59,8 +59,8 @@ jobs:
       - name: Get dependencies
         run: |
           go get -v -t -d ./...
-      - name: Run integration tests with Elasticsearch `v8.6.0`
-        run: make integration-tests ES_VERSION=8.6.0
+      - name: Run integration tests with Elasticsearch `v8.16.0`
+        run: make integration-tests ES_VERSION=8.16.0
   test-3:
     name: OpenSearch v1.3.7
     runs-on: ubuntu-latest

client/elasticClient.go

@@ -329,7 +329,7 @@ func (ec *elasticClient) createPolicy(policyName string, policy *bytes.Buffer) e
 
 // CreateIndexTemplate creates an elasticsearch index template
 func (ec *elasticClient) createIndexTemplate(templateName string, template io.Reader) error {
-	res, err := ec.client.Indices.PutTemplate(templateName, template, ec.client.Indices.PutTemplate.WithContext(context.Background()))
+	res, err := ec.client.Indices.PutIndexTemplate(templateName, template)
 	if err != nil {
 		return err
 	}

client/elasticClientCommon.go

@@ -46,7 +46,7 @@ func loadResponseBody(body io.ReadCloser, dest interface{}) error {
 		return nil
 	}
 	if dest == nil {
-		_, err := io.Copy(ioutil.Discard, body)
+		_, err := io.Copy(io.Discard, body)
 		return err
 	}
 
@@ -56,7 +56,7 @@ func loadResponseBody(body io.ReadCloser, dest interface{}) error {
 
 func elasticDefaultErrorResponseHandler(res *esapi.Response) error {
 	responseBody := map[string]interface{}{}
-	bodyBytes, err := ioutil.ReadAll(res.Body)
+	bodyBytes, err := io.ReadAll(res.Body)
 	if err != nil {
 		return fmt.Errorf("%w cannot read elastic response body bytes", err)
 	}

client/elasticClientScroll.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strconv"
 	"time"
@@ -23,9 +23,6 @@ func (ec *elasticClient) DoCountRequest(ctx context.Context, index string, body
 	if err != nil {
 		return 0, err
 	}
-	if err != nil {
-		return 0, err
-	}
 
 	bodyBytes, err := getBytesFromResponse(res)
 	if err != nil {
@@ -139,7 +136,7 @@ func getBytesFromResponse(res *esapi.Response) ([]byte, error) {
 	}
 	defer closeBody(res)
 
-	bodyBytes, err := ioutil.ReadAll(res.Body)
+	bodyBytes, err := io.ReadAll(res.Body)
 	if err != nil {
 		return nil, err
 	}

client/elasticClientScroll_test.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"context"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -24,7 +24,7 @@ func TestElasticClient_DoCountRequest(t *testing.T) {
 		jsonFile, err := os.Open("./testsData/response-count-request.json")
 		require.Nil(t, err)
 
-		byteValue, _ := ioutil.ReadAll(jsonFile)
+		byteValue, _ := io.ReadAll(jsonFile)
 		_, _ = w.Write(byteValue)
 	}
 

client/logging/customLogger.go

@@ -2,7 +2,6 @@ package logging
 
 import (
 	"io"
-	"io/ioutil"
 	"net/http"
 	"time"
 
@@ -28,10 +27,10 @@ func (cl *CustomLogger) LogRoundTrip(
 	)
 
 	if req != nil && req.Body != nil && req.Body != http.NoBody {
-		reqSize, _ = io.Copy(ioutil.Discard, req.Body)
+		reqSize, _ = io.Copy(io.Discard, req.Body)
 	}
 	if res != nil && res.Body != nil && res.Body != http.NoBody {
-		resSize, _ = io.Copy(ioutil.Discard, res.Body)
+		resSize, _ = io.Copy(io.Discard, res.Body)
 	}
 
 	if err != nil {

data/block.go

@@ -9,6 +9,7 @@ import (
 //	to be saved for a block. It has all the default fields
 //	plus some extra information for ease of search and filter
 type Block struct {
+	UUID                  string                 `json:"uuid"`
 	Nonce                 uint64                 `json:"nonce"`
 	Round                 uint64                 `json:"round"`
 	Epoch                 uint32                 `json:"epoch"`

data/event.go

@@ -4,6 +4,7 @@ import "time"
 
 // LogEvent is the dto for the log event structure
 type LogEvent struct {
+	UUID           string        `json:"uuid"`
 	ID             string        `json:"-"`
 	TxHash         string        `json:"txHash"`
 	OriginalTxHash string        `json:"originalTxHash,omitempty"`

data/logs.go

@@ -9,6 +9,7 @@ import (
 
 // Logs holds all the fields needed for a logs structure
 type Logs struct {
+	UUID           string        `json:"uuid"`
 	ID             string        `json:"-"`
 	OriginalTxHash string        `json:"originalTxHash,omitempty"`
 	Address        string        `json:"address"`

data/scresult.go

@@ -4,6 +4,7 @@ import "time"
 
 // ScResult is a structure containing all the fields that need to be saved for a smart contract result
 type ScResult struct {
+	UUID               string        `json:"uuid"`
 	Hash               string        `json:"-"`
 	MBHash             string        `json:"miniBlockHash,omitempty"`
 	Nonce              uint64        `json:"nonce"`
@@ -39,6 +40,7 @@ type ScResult struct {
 	CanBeIgnored       bool          `json:"canBeIgnored,omitempty"`
 	OriginalSender     string        `json:"originalSender,omitempty"`
 	HasLogs            bool          `json:"hasLogs,omitempty"`
+	Epoch              uint32        `json:"epoch"`
 	ExecutionOrder     int           `json:"-"`
 	SenderAddressBytes []byte        `json:"-"`
 	InitialTxGasUsed   uint64        `json:"-"`