Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix remove go work 97 #119

Merged
merged 11 commits into from
Apr 11, 2024
Merged

Fix remove go work 97 #119

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
67c95d7
fix: remove go.work
logicalangel Apr 4, 2024
dd68137
feature: remove go.work and readdress projects path
logicalangel Apr 5, 2024
bb4a7cd
fix: linter
logicalangel Apr 5, 2024
3d2c538
fix: merge
logicalangel Apr 7, 2024
cf99537
fix: merge
logicalangel Apr 9, 2024
ad3262d
fix: remove internal from some urls
logicalangel Apr 9, 2024
0cede14
fix: linter
logicalangel Apr 9, 2024
494ebf1
🔀 merge(bls): merge remove go work with bls changes >>> ⏰ 1h
logicalangel Apr 11, 2024
8994aa2
🐛 fix(bls): fix import paths of bls package >>> ⏰ 2m
logicalangel Apr 11, 2024
906d67d
🐛 fix(bls): fix paths on bls >>> ⏰ 2m
logicalangel Apr 11, 2024
44a366f
🐛 fix(quickstart): fix wrong address in the text >>> ⏰ 2m
logicalangel Apr 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/workflows/go.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ docker/pgadmin
.clinic
node_trace.*
internal/bin
bin
conf.*.private
.idea
0 internal/.golangci.yml → .golangci.yml
View file
Open in desktop
File renamed without changes.
0 internal/Makefile → Makefile
View file
Open in desktop
File renamed without changes.
0 internal/go.mod → go.mod
View file
Open in desktop
File renamed without changes.
0 internal/go.sum → go.sum
View file
Open in desktop
File renamed without changes.
6 changes: 0 additions & 6 deletions go.work
View file
Open in desktop

This file was deleted.

281 changes: 0 additions & 281 deletions go.work.sum
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion internal/address/address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package address
import (
"fmt"

"github.com/KenshiTech/unchained/crypto/shake"
"github.com/KenshiTech/unchained/internal/crypto/shake"
)

var chars = "0123456789ABCDEFGHJKMNPQRSTUVXYZ"
Expand Down
16 changes: 8 additions & 8 deletions internal/cmd/broker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)
Expand Down
30 changes: 15 additions & 15 deletions internal/cmd/consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
26 changes: 13 additions & 13 deletions internal/cmd/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions internal/crypto/bls/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion internal/crypto/kosk/kosk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/datasets/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"`
Expand Down
6 changes: 3 additions & 3 deletions internal/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/ent/assetprice.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/ent/assetprice/where.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/ent/assetprice_create.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/ent/assetprice_delete.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/ent/assetprice_query.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions internal/ent/assetprice_update.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions internal/ent/client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/ent/correctnessreport.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion internal/ent/correctnessreport/where.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/ent/correctnessreport_create.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/ent/correctnessreport_delete.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/ent/correctnessreport_query.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions internal/ent/correctnessreport_update.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading