Merge pull request #24 from Zondax/refactor

Refactor

Author: jleni

.github/workflows/main.yml

@@ -1,7 +1,6 @@
 name: Build jobs
 
 on:
-  push:
   pull_request:
     branches:
       - main
@@ -16,7 +15,7 @@ jobs:
           submodules: true
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.16'
+          go-version: '^1.17'
       - name: Build
         run: |
           make build
@@ -30,11 +29,47 @@ jobs:
           submodules: true
       - uses: actions/setup-go@v2
         with:
-          go-version: '^1.16'
+          go-version: '^1.17'
       - run: make build
       - name: ModTidy check
         run: make check-modtidy
       - name: Lint check
         run: |
           make install_lint
           make lint
+
+  tests-components:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.17'
+      - name: "Launch db engine in background"
+        run: |
+          make test-database-up
+      - name: "Give time for processes to start"
+        run: sleep 5
+      - name: Components tests
+        run:  make test-components
+
+  tests-integration:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - uses: actions/setup-go@v2
+        with:
+          go-version: '^1.17'
+      - name: "Launch db engine in background"
+        run: |
+          make test-database-up
+      - name: "Give time for processes to start"
+        run: sleep 5
+      - name: Integration test
+        run:  make test-integration

Makefile

@@ -9,7 +9,7 @@ gitclean:
 	git submodule foreach --recursive git clean -xfd
 
 install_lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.35.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell go env GOPATH)/bin v1.41.1
 
 check-modtidy:
 	go mod tidy
@@ -24,9 +24,17 @@ test: build
 	go test -race ./...
 
 test-database: build
-	go test ./connections/database/... -v
+	go test ./components/connections/database/... -v
+
+test-integration: build
+	go test -v ./indexer/tests/...
+
+test-components: build
+	 go test -v ./components/...
 
 # Docker
+test-database-up:
+	docker-compose -f ./indexer/tests/docker-compose.yml up -d
 
 test-database-services:
 	docker-compose -f tests_docker/test_database.yml up --abort-on-container-exit

connections/data_source.go components/connections/data_source.goconnections/data_source.go renamed to components/connections/data_source.go

@@ -2,8 +2,8 @@ package connections
 
 import (
 	"context"
-	ds "github.com/Zondax/zindexer/connections/data_store"
-	"github.com/Zondax/zindexer/connections/database"
+	"github.com/Zondax/zindexer/components/connections/data_store"
+	"github.com/Zondax/zindexer/components/connections/database"
 	"github.com/coinbase/rosetta-sdk-go/client"
 	"go.mongodb.org/mongo-driver/mongo"
 	"gorm.io/gorm"
@@ -21,7 +21,7 @@ type DataSource struct {
 	DatabaseMongoCfg    database.DBConnectionParams
 	RosettaClient       *client.APIClient
 	NodeClient          interface{}
-	DataStore           ds.DataStoreClient
+	DataStore           data_store.DataStoreClient
 	// common
 	Ctx        context.Context
 	RetryDelay time.Duration
@@ -87,9 +87,9 @@ func WithNodeClient(node interface{}) SourceOption {
 	}
 }
 
-func WithDataStore(cfg ds.DataStoreConfig) SourceOption {
+func WithDataStore(cfg data_store.DataStoreConfig) SourceOption {
 	return func(w *DataSource) {
-		storeClient, err := ds.NewDataStoreClient(cfg)
+		storeClient, err := data_store.NewDataStoreClient(cfg)
 		if err != nil {
 			panic(err)
 		}

connections/data_store/builder.go …onents/connections/data_store/builder.goconnections/data_store/builder.go renamed to components/connections/data_store/builder.go connections/data_store/builder.go renamed to components/connections/data_store/builder.go

@@ -3,12 +3,12 @@ package graphql
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/Zondax/zindexer/components/connections/database"
 	"io/ioutil"
 	"net/http"
 	"strings"
 	"time"
 
-	"github.com/Zondax/zindexer/connections/database"
 	"github.com/hasura/go-graphql-client"
 	"go.uber.org/zap"
 )

connections/data_store/interface.go …ents/connections/data_store/interface.goconnections/data_store/interface.go renamed to components/connections/data_store/interface.go connections/data_store/interface.go renamed to components/connections/data_store/interface.go

@@ -3,7 +3,7 @@ package mongodb
 import (
 	"context"
 	"fmt"
-	"github.com/Zondax/zindexer/connections/database"
+	"github.com/Zondax/zindexer/components/connections/database"
 	"go.uber.org/zap"
 	"time"
 

connections/data_store/local.go …mponents/connections/data_store/local.goconnections/data_store/local.go renamed to components/connections/data_store/local.go connections/data_store/local.go renamed to components/connections/data_store/local.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"crypto/rand"
 	"fmt"
-	"github.com/Zondax/zindexer/connections/database"
+	"github.com/Zondax/zindexer/components/connections/database"
 	"go.mongodb.org/mongo-driver/bson"
 	"os"
 	"testing"