fix: clean old gateway hardcoding

seed-hypermedia · Jan 9, 2024 · 261943c · 261943c
1 parent c1cc30b
commit 261943c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/backend/daemon/api/apis.go b/backend/daemon/api/apis.go
@@ -42,7 +42,6 @@ func New(
 	sync *future.ReadOnly[*syncing.Service],
 	wallet *wallet.Service,
 	LogLevel string,
-	testnet bool,
 ) Server {
 	doSync := func() error {
 		s, ok := sync.Get()
@@ -59,7 +58,7 @@ func New(
 		return nil
 	}
 
-	documentsSrv := documents.NewServer(repo.Identity(), db, &lazyDiscoverer{sync: sync, net: node}, &lazyGwClient{net: node}, LogLevel, testnet)
+	documentsSrv := documents.NewServer(repo.Identity(), db, &lazyDiscoverer{sync: sync, net: node}, &lazyGwClient{net: node}, LogLevel)
 	return Server{
 		Accounts:   accounts.NewServer(repo.Identity(), blobs),
 		Daemon:     daemon.NewServer(repo, blobs, wallet, doSync),

diff --git a/backend/daemon/api/documents/v1alpha/documents.go b/backend/daemon/api/documents/v1alpha/documents.go
@@ -49,18 +49,16 @@ type Server struct {
 	disc     Discoverer
 	blobs    *hyper.Storage
 	gwClient GatewayClient
-	testnet  bool
 }
 
 // NewServer creates a new RPC handler.
-func NewServer(me *future.ReadOnly[core.Identity], db *sqlitex.Pool, disc Discoverer, gwClient GatewayClient, LogLevel string, testnet bool) *Server {
+func NewServer(me *future.ReadOnly[core.Identity], db *sqlitex.Pool, disc Discoverer, gwClient GatewayClient, LogLevel string) *Server {
 	srv := &Server{
 		db:       db,
 		me:       me,
 		disc:     disc,
 		blobs:    hyper.NewStorage(db, logging.New("mintter/hyper", LogLevel)),
 		gwClient: gwClient,
-		testnet:  testnet,
 	}
 
 	return srv

diff --git a/backend/daemon/api/documents/v1alpha/documents_test.go b/backend/daemon/api/documents/v1alpha/documents_test.go
@@ -858,7 +858,7 @@ func newTestDocsAPI(t *testing.T, name string) *Server {
 	fut := future.New[core.Identity]()
 	require.NoError(t, fut.Resolve(u.Identity))
 
-	srv := NewServer(fut.ReadOnly, db, nil, nil, "debug", true)
+	srv := NewServer(fut.ReadOnly, db, nil, nil, "debug")
 	bs := hyper.NewStorage(db, logging.New("mintter/hyper", "debug"))
 	_, err := daemon.Register(context.Background(), bs, u.Account, u.Device.PublicKey, time.Now())
 	require.NoError(t, err)

diff --git a/backend/daemon/daemon.go b/backend/daemon/daemon.go
@@ -145,7 +145,7 @@ func Load(ctx context.Context, cfg config.Config, r *storage.Dir, extraOpts ...i
 		}
 	}
 
-	a.GRPCServer, a.GRPCListener, a.RPC, err = initGRPC(ctx, cfg.GRPC.Port, &a.clean, a.g, a.Storage, a.DB, a.Blobs, a.Net, a.Syncing, a.Wallet, cfg.LogLevel, cfg.P2P.TestnetName != "", extraOpts...)
+	a.GRPCServer, a.GRPCListener, a.RPC, err = initGRPC(ctx, cfg.GRPC.Port, &a.clean, a.g, a.Storage, a.DB, a.Blobs, a.Net, a.Syncing, a.Wallet, cfg.LogLevel, extraOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -402,7 +402,6 @@ func initGRPC(
 	sync *future.ReadOnly[*syncing.Service],
 	wallet *wallet.Service,
 	LogLevel string,
-	testnet bool,
 	extras ...interface{},
 ) (srv *grpc.Server, lis net.Listener, rpc api.Server, err error) {
 	lis, err = net.Listen("tcp", ":"+strconv.Itoa(port))
@@ -418,7 +417,7 @@ func initGRPC(
 	}
 	srv = grpc.NewServer(opts...)
 
-	rpc = api.New(ctx, repo, pool, blobs, node, sync, wallet, LogLevel, testnet)
+	rpc = api.New(ctx, repo, pool, blobs, node, sync, wallet, LogLevel)
 	rpc.Register(srv)
 	reflection.Register(srv)