Merge pull request #119 from KenshiTech/fix-remove-go-work-97

Fix remove go work 97
TimeleapLabs · Apr 11, 2024 · 9532b86 · 9532b86
2 parents 551a83e + 44a366f
commit 9532b86
Show file tree

Hide file tree

Showing 100 changed files with 346 additions and 636 deletions.
diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -23,13 +23,10 @@ jobs:
           cache: false
 
       - name: Install Tools
-        working-directory: "internal"
         run: make tools
 
       - name: Lint
-        working-directory: "internal"
         run: make lint
 
       - name: Error Check
-        working-directory: "internal"
         run: make errors
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -22,18 +22,18 @@ jobs:
         with:
           go-version: "stable"
           cache-dependency-path: |
-            internal/go.sum
+            go.sum
 
       - name: Build
-        run: cd internal && make prod
+        run: make prod
 
       - name: "Run release script"
         run: node scripts/docker-release.mjs ${{ github.ref_name }}
 
       - name: "Release"
         uses: softprops/action-gh-release@v1
         with:
-          files: ./internal/bin/*
+          files: ./bin/*
           name: Unchained ${{ github.ref_name}}
           tag_name: ${{ github.ref_name }}
           prerelease: ${{ contains(github.ref_name, 'alpha') || contains(github.ref_name, 'beta') }}

diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,6 @@ docker/pgadmin
 .clinic
 node_trace.*
 internal/bin
+bin
 conf.*.private
 .idea
diff --git a/internal/.golangci.yml → .golangci.yml b/internal/.golangci.yml → .golangci.yml
diff --git a/internal/Makefile → Makefile b/internal/Makefile → Makefile
diff --git a/internal/go.mod → go.mod b/internal/go.mod → go.mod
diff --git a/internal/go.sum → go.sum b/internal/go.sum → go.sum
diff --git a/go.work b/go.work
diff --git a/go.work.sum b/go.work.sum
diff --git a/internal/address/address.go b/internal/address/address.go
@@ -3,7 +3,7 @@ package address
 import (
 	"fmt"
 
-	"github.com/KenshiTech/unchained/crypto/shake"
+	"github.com/KenshiTech/unchained/internal/crypto/shake"
 )
 
 var chars = "0123456789ABCDEFGHJKMNPQRSTUVXYZ"

diff --git a/internal/cmd/broker.go b/internal/cmd/broker.go
@@ -1,14 +1,14 @@
 package cmd
 
 import (
-	"github.com/KenshiTech/unchained/config"
-	"github.com/KenshiTech/unchained/constants"
-	"github.com/KenshiTech/unchained/crypto/bls"
-	"github.com/KenshiTech/unchained/ethereum"
-	"github.com/KenshiTech/unchained/log"
-	"github.com/KenshiTech/unchained/pos"
-	"github.com/KenshiTech/unchained/transport/server"
-	"github.com/KenshiTech/unchained/transport/server/websocket"
+	"github.com/KenshiTech/unchained/internal/config"
+	"github.com/KenshiTech/unchained/internal/constants"
+	"github.com/KenshiTech/unchained/internal/crypto/bls"
+	"github.com/KenshiTech/unchained/internal/ethereum"
+	"github.com/KenshiTech/unchained/internal/log"
+	"github.com/KenshiTech/unchained/internal/pos"
+	"github.com/KenshiTech/unchained/internal/transport/server"
+	"github.com/KenshiTech/unchained/internal/transport/server/websocket"
 
 	"github.com/spf13/cobra"
 )

diff --git a/internal/cmd/consumer.go b/internal/cmd/consumer.go
@@ -1,21 +1,21 @@
 package cmd
 
 import (
-	"github.com/KenshiTech/unchained/config"
-	"github.com/KenshiTech/unchained/constants"
-	"github.com/KenshiTech/unchained/crypto/bls"
-	"github.com/KenshiTech/unchained/db"
-	"github.com/KenshiTech/unchained/ethereum"
-	"github.com/KenshiTech/unchained/log"
-	"github.com/KenshiTech/unchained/pos"
-	correctnessService "github.com/KenshiTech/unchained/service/correctness"
-	evmlogService "github.com/KenshiTech/unchained/service/evmlog"
-	uniswapService "github.com/KenshiTech/unchained/service/uniswap"
-	"github.com/KenshiTech/unchained/transport/client"
-	"github.com/KenshiTech/unchained/transport/client/conn"
-	"github.com/KenshiTech/unchained/transport/client/handler"
-	"github.com/KenshiTech/unchained/transport/server"
-	"github.com/KenshiTech/unchained/transport/server/gql"
+	"github.com/KenshiTech/unchained/internal/config"
+	"github.com/KenshiTech/unchained/internal/constants"
+	"github.com/KenshiTech/unchained/internal/crypto/bls"
+	"github.com/KenshiTech/unchained/internal/db"
+	"github.com/KenshiTech/unchained/internal/ethereum"
+	"github.com/KenshiTech/unchained/internal/log"
+	"github.com/KenshiTech/unchained/internal/pos"
+	correctnessService "github.com/KenshiTech/unchained/internal/service/correctness"
+	evmlogService "github.com/KenshiTech/unchained/internal/service/evmlog"
+	uniswapService "github.com/KenshiTech/unchained/internal/service/uniswap"
+	"github.com/KenshiTech/unchained/internal/transport/client"
+	"github.com/KenshiTech/unchained/internal/transport/client/conn"
+	"github.com/KenshiTech/unchained/internal/transport/client/handler"
+	"github.com/KenshiTech/unchained/internal/transport/server"
+	"github.com/KenshiTech/unchained/internal/transport/server/gql"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/root.go b/internal/cmd/root.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/log"
 
-	"github.com/KenshiTech/unchained/constants"
+	"github.com/KenshiTech/unchained/internal/constants"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/cmd/worker.go b/internal/cmd/worker.go
@@ -1,19 +1,19 @@
 package cmd
 
 import (
-	"github.com/KenshiTech/unchained/config"
-	"github.com/KenshiTech/unchained/constants"
-	"github.com/KenshiTech/unchained/crypto/bls"
-	"github.com/KenshiTech/unchained/ethereum"
-	"github.com/KenshiTech/unchained/log"
-	"github.com/KenshiTech/unchained/persistence"
-	"github.com/KenshiTech/unchained/pos"
-	"github.com/KenshiTech/unchained/scheduler"
-	evmlogService "github.com/KenshiTech/unchained/service/evmlog"
-	uniswapService "github.com/KenshiTech/unchained/service/uniswap"
-	"github.com/KenshiTech/unchained/transport/client"
-	"github.com/KenshiTech/unchained/transport/client/conn"
-	"github.com/KenshiTech/unchained/transport/client/handler"
+	"github.com/KenshiTech/unchained/internal/config"
+	"github.com/KenshiTech/unchained/internal/constants"
+	"github.com/KenshiTech/unchained/internal/crypto/bls"
+	"github.com/KenshiTech/unchained/internal/ethereum"
+	"github.com/KenshiTech/unchained/internal/log"
+	"github.com/KenshiTech/unchained/internal/persistence"
+	"github.com/KenshiTech/unchained/internal/pos"
+	"github.com/KenshiTech/unchained/internal/scheduler"
+	evmlogService "github.com/KenshiTech/unchained/internal/service/evmlog"
+	uniswapService "github.com/KenshiTech/unchained/internal/service/uniswap"
+	"github.com/KenshiTech/unchained/internal/transport/client"
+	"github.com/KenshiTech/unchained/internal/transport/client/conn"
+	"github.com/KenshiTech/unchained/internal/transport/client/handler"
 	"github.com/spf13/cobra"
 )
 

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -3,9 +3,9 @@ package config
 import (
 	"os"
 
-	"github.com/KenshiTech/unchained/log"
+	"github.com/KenshiTech/unchained/internal/log"
 
-	"github.com/KenshiTech/unchained/constants"
+	"github.com/KenshiTech/unchained/internal/constants"
 	"gopkg.in/yaml.v3"
 
 	"github.com/ilyakaznacheev/cleanenv"

diff --git a/internal/config/config_test.go b/internal/config/config_test.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/KenshiTech/unchained/config"
-	"github.com/KenshiTech/unchained/constants"
+	"github.com/KenshiTech/unchained/internal/config"
+	"github.com/KenshiTech/unchained/internal/constants"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/internal/crypto/bls/store.go b/internal/crypto/bls/store.go
@@ -4,12 +4,12 @@ import (
 	"encoding/hex"
 	"math/big"
 
-	"github.com/KenshiTech/unchained/config"
+	"github.com/KenshiTech/unchained/internal/address"
+	"github.com/KenshiTech/unchained/internal/datasets"
+	"github.com/KenshiTech/unchained/internal/ethereum"
+	"github.com/KenshiTech/unchained/internal/log"
 
-	"github.com/KenshiTech/unchained/address"
-	"github.com/KenshiTech/unchained/datasets"
-	"github.com/KenshiTech/unchained/ethereum"
-	"github.com/KenshiTech/unchained/log"
+	"github.com/KenshiTech/unchained/internal/config"
 
 	"github.com/btcsuite/btcutil/base58"
 

diff --git a/internal/crypto/kosk/kosk.go b/internal/crypto/kosk/kosk.go
@@ -5,7 +5,7 @@ package kosk
 import (
 	"crypto/rand"
 
-	"github.com/KenshiTech/unchained/crypto/bls"
+	"github.com/KenshiTech/unchained/internal/crypto/bls"
 
 	sia "github.com/pouya-eghbali/go-sia/v2/pkg"
 )

diff --git a/internal/datasets/token.go b/internal/datasets/token.go
@@ -1,6 +1,6 @@
 package datasets
 
-import "github.com/KenshiTech/unchained/config"
+import "github.com/KenshiTech/unchained/internal/config"
 
 type Token struct {
 	ID     *string  `mapstructure:"id"`

diff --git a/internal/db/db.go b/internal/db/db.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"database/sql"
 
-	"github.com/KenshiTech/unchained/log"
+	"github.com/KenshiTech/unchained/internal/log"
 
-	"github.com/KenshiTech/unchained/config"
-	"github.com/KenshiTech/unchained/ent"
+	"github.com/KenshiTech/unchained/internal/config"
+	"github.com/KenshiTech/unchained/internal/ent"
 
 	"entgo.io/ent/dialect"
 	entsql "entgo.io/ent/dialect/sql"

diff --git a/internal/ent/assetprice.go b/internal/ent/assetprice.go
diff --git a/internal/ent/assetprice/where.go b/internal/ent/assetprice/where.go
diff --git a/internal/ent/assetprice_create.go b/internal/ent/assetprice_create.go
diff --git a/internal/ent/assetprice_delete.go b/internal/ent/assetprice_delete.go
diff --git a/internal/ent/assetprice_query.go b/internal/ent/assetprice_query.go
diff --git a/internal/ent/assetprice_update.go b/internal/ent/assetprice_update.go
diff --git a/internal/ent/client.go b/internal/ent/client.go
diff --git a/internal/ent/correctnessreport.go b/internal/ent/correctnessreport.go
diff --git a/internal/ent/correctnessreport/where.go b/internal/ent/correctnessreport/where.go
diff --git a/internal/ent/correctnessreport_create.go b/internal/ent/correctnessreport_create.go
diff --git a/internal/ent/correctnessreport_delete.go b/internal/ent/correctnessreport_delete.go
diff --git a/internal/ent/correctnessreport_query.go b/internal/ent/correctnessreport_query.go
diff --git a/internal/ent/correctnessreport_update.go b/internal/ent/correctnessreport_update.go