Refactor: Move Signal server and client (#80)

* Move Signal Server

* Move Signal Client

* Cleanup duplicates and unused files

* Moved Signal client tests
This commit is contained in:
Maycon Santos
2021-08-09 19:21:48 +02:00
committed by GitHub
parent 9f0c86c28e
commit d5af5f1878
10 changed files with 15 additions and 75 deletions
+2 -2
View File
@@ -6,8 +6,8 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/wiretrustee/wiretrustee/encryption"
sig "github.com/wiretrustee/wiretrustee/signal"
sigProto "github.com/wiretrustee/wiretrustee/signal/proto"
"github.com/wiretrustee/wiretrustee/signal/server"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"
@@ -65,7 +65,7 @@ var (
log.Fatalf("failed to listen: %v", err)
}
sigProto.RegisterSignalExchangeServer(grpcServer, sig.NewServer())
sigProto.RegisterSignalExchangeServer(grpcServer, server.NewServer())
log.Printf("started server: localhost:%v", signalPort)
if err := grpcServer.Serve(lis); err != nil {
log.Fatalf("failed to serve: %v", err)
+2 -2
View File
@@ -2,6 +2,7 @@ package cmd
import (
"context"
signal "github.com/wiretrustee/wiretrustee/signal/client"
"io"
"os"
"strings"
@@ -12,7 +13,6 @@ import (
"github.com/wiretrustee/wiretrustee/connection"
"github.com/wiretrustee/wiretrustee/encryption"
mgm "github.com/wiretrustee/wiretrustee/management/proto"
sig "github.com/wiretrustee/wiretrustee/signal"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
@@ -44,7 +44,7 @@ var (
var sigTLSEnabled = false
ctx := context.Background()
signalClient, err := sig.NewClient(ctx, config.SignalAddr, myKey, sigTLSEnabled)
signalClient, err := signal.NewClient(ctx, config.SignalAddr, myKey, sigTLSEnabled)
if err != nil {
log.Errorf("error while connecting to the Signal Exchange Service %s: %s", config.SignalAddr, err)
os.Exit(ExitSetupFailed)