Merged

cmd/api/handlers/account.go

@@ -52,10 +52,10 @@ func (ctx *Context) GetInfo(c *gin.Context) {
 		LastAction: stats.LastAction,
 	}
 
-	alias, err := ctx.ES.GetAlias(req.Network, req.Address)
+	alias, err := ctx.TZIP.GetAlias(req.Network, req.Address)
 	if err != nil {
-		if !elastic.IsRecordNotFound(err) {
-			handleError(c, err, 0)
+		if !ctx.Storage.IsRecordNotFound(err) {
+			ctx.handleError(c, err, 0)
 			return
 		}
 	} else {

cmd/api/handlers/bigmap.go

@@ -78,10 +78,10 @@ func (ctx *Context) GetBigMap(c *gin.Context) {
 		}
 	}
 
-	alias, err := ctx.ES.GetAlias(req.Network, res.Address)
+	alias, err := ctx.TZIP.GetAlias(req.Network, res.Address)
 	if err != nil {
-		if !elastic.IsRecordNotFound(err) {
-			handleError(c, err, 0)
+		if !ctx.Storage.IsRecordNotFound(err) {
+			ctx.handleError(c, err, 0)
 			return
 		}
 	} else {

cmd/api/handlers/events.go

@@ -114,9 +114,9 @@ func (ctx *Context) getMempoolEvents(subscriptions []database.Subscription) ([]m
 			continue
 		}
 
-		aliases, err := ctx.ES.GetAliasesMap(sub.Network)
+		aliases, err := ctx.TZIP.GetAliasesMap(sub.Network)
 		if err != nil {
-			if !elastic.IsRecordNotFound(err) {
+			if !ctx.Storage.IsRecordNotFound(err) {
 				return nil, err
 			}
 			aliases = make(map[string]string)

cmd/api/handlers/mempool.go

@@ -8,7 +8,6 @@ import (
 	"github.com/baking-bad/bcdhub/internal/contractparser/consts"
 	"github.com/baking-bad/bcdhub/internal/contractparser/meta"
 	"github.com/baking-bad/bcdhub/internal/contractparser/newmiguel"
-	"github.com/baking-bad/bcdhub/internal/elastic"
 	"github.com/baking-bad/bcdhub/internal/helpers"
 	"github.com/baking-bad/bcdhub/internal/tzkt"
 	"github.com/gin-gonic/gin"
@@ -59,9 +58,9 @@ func (ctx *Context) prepareMempoolOperations(res []tzkt.MempoolOperation, addres
 		return ret, nil
 	}
 
-	aliases, err := ctx.ES.GetAliasesMap(network)
+	aliases, err := ctx.TZIP.GetAliasesMap(network)
 	if err != nil {
-		if !elastic.IsRecordNotFound(err) {
+		if !ctx.Storage.IsRecordNotFound(err) {
 			return nil, err
 		}
 		aliases = make(map[string]string)

cmd/api/handlers/operations.go

@@ -430,9 +430,9 @@ func (ctx *Context) prepareMempoolOperation(item tzkt.MempoolOperation, network
 		RawMempool:   string(item.Raw),
 	}
 
-	aliases, err := ctx.ES.GetAliasesMap(network)
+	aliases, err := ctx.TZIP.GetAliasesMap(network)
 	if err != nil {
-		if !elastic.IsRecordNotFound(err) {
+		if !ctx.Storage.IsRecordNotFound(err) {
 			return &op
 		}
 	} else {

cmd/metrics/operations.go

@@ -39,7 +39,9 @@ func getOperation(ids []string) error {
 }
 
 func parseOperation(h *metrics.Handler, operation operation.Operation) error {
-	h.SetOperationAliases(&operation)
+	if _, err := h.SetOperationAliases(&operation); err != nil {
+		return err
+	}
 	h.SetOperationStrings(&operation)
 
 	if helpers.IsContract(operation.Destination) || operation.IsOrigination() {