Skip to content

Commit e8bc5e1

Browse files
committed
remove extra grid3 packages
1 parent 6a7aa3f commit e8bc5e1

18 files changed

+27
-261
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
dir:
22-
- activation-service
23-
- farmerbot
24-
- grid-cli
25-
- grid-proxy
26-
# - grid-client
27-
- gridify
28-
- monitoring-bot
29-
# - rmb-sdk-go
30-
- user-contracts-mon
31-
- tfrobot
22+
- node-registrar
3223

3324
steps:
3425
- uses: actions/checkout@v4
@@ -58,16 +49,7 @@ jobs:
5849
fail-fast: false
5950
matrix:
6051
dir:
61-
- activation-service
62-
- farmerbot
63-
- grid-cli
64-
- grid-proxy
65-
# - grid-client
66-
- gridify
67-
- monitoring-bot
68-
# - rmb-sdk-go
69-
- user-contracts-mon
70-
- tfrobot
52+
- node-registrar
7153

7254
steps:
7355
- name: Checkout the repo

.github/workflows/clean_test_account.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/grid-client-integration.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/grid-proxy-integration.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/lint.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,4 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
dir:
30-
- activation-service
31-
- farmerbot
32-
- grid-cli
33-
- grid-client
34-
- grid-proxy
35-
- gridify
36-
- monitoring-bot
37-
- rmb-sdk-go
38-
- user-contracts-mon
39-
- tfrobot
30+
- node-registrar

.github/workflows/publish-images.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,6 @@ jobs:
2626
fail-fast: false
2727
matrix:
2828
include:
29-
- dir: "activation-service"
30-
image: "tfactivation"
31-
- dir: "farmerbot"
32-
image: "tffarmerbot"
33-
- dir: "grid-proxy"
34-
image: "tfgridproxy"
35-
- dir: "tools/relay-cache-warmer"
36-
image: "relay-cache-warmer"
3729
- dir: "node-registrar"
3830
image: "tfregistrar"
3931

.github/workflows/test.yml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,4 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
dir:
35-
- activation-service
36-
- farmerbot
37-
- grid-cli
38-
- grid-client
39-
- gridify
40-
- monitoring-bot
41-
- rmb-sdk-go
42-
- user-contracts-mon
43-
- tfrobot
35+
- node-registrar

.github/workflows/tfrobot_test.yml

Lines changed: 0 additions & 46 deletions
This file was deleted.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
DIRS := "activation-service" "farmerbot" "grid-cli" "grid-client" "grid-proxy" "gridify" "monitoring-bot" "rmb-sdk-go" "user-contracts-mon" "tfrobot" "node-registrar"
1+
DIRS := "node-registrar"
22

33
mainnet-release:
44
cd grid-client && go get github.com/threefoldtech/tfchain/clients/tfchain-client-go@5d6a2dd

README.md

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,6 @@ This repo contains the go clients for Threefold grid.
77

88
## Packages
99

10-
- [grid client](./grid-client/README.md)
11-
- [grid proxy](./grid-proxy/README.md)
12-
- [grid cli](./grid-cli/README.md)
13-
- [rmb client](./rmb-sdk-go/README.md)
14-
- [gridify](./gridify/README.md)
15-
- [monitoring bot](./monitoring-bot/README.md)
16-
- [tfrobot](./tfrobot/README.md)
17-
- [user contracts mon](./user-contracts-mon/README.md)
18-
- [activation service](./activation-service/README.md)
19-
- [farmerbot](./farmerbot/README.md)
2010
- [node-registrar](./node-registrar/README.md)
2111

2212
## Release

go.work

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
go 1.21.0
2+
3+
use ./node-registrar

go.work.sum

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
2+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
3+
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
4+
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
5+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
6+
github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
7+
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
8+
github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
9+
golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0=
10+
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
11+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
12+
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

node-registrar/cmds/registrar.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/pkg/errors"
1313
"github.com/rs/zerolog"
1414
"github.com/rs/zerolog/log"
15-
"github.com/threefoldtech/tfgrid-sdk-go/node-registrar/pkg/db"
16-
"github.com/threefoldtech/tfgrid-sdk-go/node-registrar/pkg/server"
15+
"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/db"
16+
"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/server"
1717
"gorm.io/gorm/logger"
1818
)
1919

node-registrar/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/threefoldtech/tfgrid-sdk-go/node-registrar
1+
module github.com/threefoldtech/tfgrid4-sdk-go/node-registrar
22

33
go 1.21
44

node-registrar/pkg/server/handlers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"github.com/gin-gonic/gin"
1212
"github.com/lib/pq"
1313
"github.com/rs/zerolog/log"
14-
"github.com/threefoldtech/tfgrid-sdk-go/node-registrar/pkg/db"
14+
"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/db"
1515
)
1616

1717
const (

node-registrar/pkg/server/middlewares.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/gin-gonic/gin"
13-
"github.com/threefoldtech/tfgrid-sdk-go/node-registrar/pkg/db"
13+
"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/db"
1414
)
1515

1616
const (

node-registrar/pkg/server/routes.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package server
22

33
import (
4-
_ "github.com/threefoldtech/tfgrid-sdk-go/node-registrar/docs"
4+
_ "github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/docs"
55

66
swaggerFiles "github.com/swaggo/files"
77
ginSwagger "github.com/swaggo/gin-swagger"
@@ -44,5 +44,4 @@ func (s *Server) SetupRoutes() {
4444
// protected by admin key
4545
zosRoutes.Use(s.AuthMiddleware())
4646
zosRoutes.PUT("/version", s.setZOSVersionHandler)
47-
4847
}

node-registrar/pkg/server/server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/gin-gonic/gin"
1010
"github.com/rs/zerolog/log"
11-
"github.com/threefoldtech/tfgrid-sdk-go/node-registrar/pkg/db"
11+
"github.com/threefoldtech/tfgrid4-sdk-go/node-registrar/pkg/db"
1212
)
1313

1414
type Server struct {

0 commit comments

Comments
 (0)