feat: move the db objects to the delta main (#152)

Author: Alvin Reyes

api/admin.go

@@ -7,7 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/google/uuid"

api/deal.go

@@ -9,7 +9,7 @@ import (
 	"delta/utils"
 	"encoding/json"
 	"fmt"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/google/uuid"
 	"github.com/ipfs/go-cid"
 	"github.com/multiformats/go-multiaddr"

api/node.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"delta/core"
-	"github.com/application-research/delta-db/db_models"
+	"delta/models"
 	"github.com/labstack/echo/v4"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"

api/open_info.go

@@ -3,7 +3,7 @@ package api
 import (
 	"context"
 	"delta/core"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/filecoin-project/go-address"
 	"github.com/filecoin-project/lotus/chain/types"
 	"github.com/labstack/echo/v4"

api/open_stats.go

@@ -4,7 +4,7 @@ import (
 	"delta/core"
 	"delta/jobs"
 	"delta/utils"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/labstack/echo/v4"
 	"strconv"
 )

api/repair_retry.go

@@ -5,7 +5,7 @@ import (
 	"delta/jobs"
 	"delta/utils"
 	"encoding/json"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/labstack/echo/v4"
 	"strings"
 	"time"

api/router.go

@@ -3,18 +3,15 @@ package api
 import (
 	"delta/config"
 	"delta/core"
-	"delta/utils"
+	_ "delta/docs/swagger"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
-	"time"
 
-	_ "delta/docs/swagger"
-	"github.com/application-research/delta-db/messaging"
 	logging "github.com/ipfs/go-log/v2"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
@@ -268,46 +265,6 @@ func ValidateRequestBody() echo.MiddlewareFunc {
 // ErrorHandler It's a function that is called when an error occurs.
 func ErrorHandler(err error, c echo.Context) {
 
-	ip := DeltaNodeConfig.Node.AnnounceAddrIP
-
-	// get the request body and log it
-
-	s := struct {
-		RemoteIP     string `json:"remote_ip"`
-		PublicIP     string `json:"public_ip"`
-		Host         string `json:"host"`
-		Referer      string `json:"referer"`
-		Request      string `json:"request"`
-		Path         string `json:"path"`
-		ErrorDetails string `json:"details"`
-	}{
-		RemoteIP:     c.RealIP(),
-		PublicIP:     ip,
-		Host:         c.Request().Host,
-		Referer:      c.Request().Referer(),
-		Request:      c.Request().RequestURI,
-		Path:         c.Path(),
-		ErrorDetails: err.Error(),
-	}
-
-	b, errM := json.Marshal(s)
-	if errM != nil {
-		log.Error(errM)
-	}
-
-	// It's sending the error to the log server.
-	utils.GlobalDeltaDataReporter.TraceLog(
-		messaging.LogEvent{
-			LogEventType:   "Error: " + core.GetHostname() + " " + c.Request().Method + " " + c.Path(),
-			SourceHost:     core.GetHostname(),
-			SourceIP:       ip,
-			LogEventObject: b,
-			LogEvent:       c.Path(),
-			DeltaUuid:      DeltaNodeConfig.Node.InstanceUuid,
-			CreatedAt:      time.Now(),
-			UpdatedAt:      time.Now(),
-		})
-
 	var httpRespErr *HttpError
 	if xerrors.As(err, &httpRespErr) {
 		log.Errorf("handler error: %s", err)

api/stats.go

@@ -2,7 +2,7 @@ package api
 
 import (
 	"delta/core"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"strings"
 
 	"github.com/labstack/echo/v4"

api/websocket.go

@@ -3,7 +3,7 @@ package api
 import (
 	"delta/core"
 	"fmt"
-	model "github.com/application-research/delta-db/db_models"
+	model "delta/models"
 	"github.com/gorilla/websocket"
 	"github.com/labstack/echo/v4"
 	"sync"

cmd/daemon.go

@@ -4,16 +4,13 @@ import (
 	"delta/api"
 	c "delta/config"
 	"delta/core"
+	_ "delta/models"
 	"delta/utils"
 	"fmt"
-	"github.com/application-research/delta-db/db_models"
-	_ "github.com/application-research/delta-db/db_models"
-	"github.com/application-research/delta-db/messaging"
 	"github.com/filecoin-project/go-address"
 	"github.com/jasonlvhit/gocron"
 	"github.com/urfave/cli/v2"
 	"runtime"
-	"time"
 )
 
 // DaemonCmd Creating a new command called `daemon` that will run the API node.
@@ -186,17 +183,6 @@ By: Protocol Labs - Outercore Engineering
 ` + utils.Reset + utils.Red + "version: " + cfg.Common.Version + utils.Reset)
 
 			fmt.Println(utils.Blue + "Reporting Delta startup logs" + utils.Reset)
-			utils.GlobalDeltaDataReporter.Trace(messaging.DeltaMetricsBaseMessage{
-				ObjectType: "DeltaStartupLogs",
-				Object: db_models.DeltaStartupLogs{
-					NodeInfo:      core.GetHostname(),
-					OSDetails:     runtime.GOARCH + " " + runtime.GOOS,
-					IPAddress:     ip,
-					DeltaNodeUuid: cfg.Node.InstanceUuid,
-					CreatedAt:     time.Now(),
-					UpdatedAt:     time.Now(),
-				},
-			})
 			fmt.Println(utils.Blue + "Reporting Delta startup logs... DONE" + utils.Reset)
 			fmt.Println("----------------------------------")
 			fmt.Println(utils.Green + "Welcome! Delta daemon is running..." + utils.Reset)