refactor(project): ♻️ update code according to dependency changes

master
Xeronith 2023-06-26 11:28:16 +03:30
rodzic d83b595223
commit 071028aa39
4 zmienionych plików z 11 dodań i 11 usunięć

Wyświetl plik

@ -325,7 +325,7 @@ func TestMain(main *testing.M) {
emailProvider := email.NewProvider(logger)
smsProvider := sms.NewProvider(logger)
if testServer, err := server.New(configuration, operationsFactory, handlersFactory, OPCODES); err != nil {
if testServer, err := server.New(configuration, operationsFactory, handlersFactory); err != nil {
logger.Fatal(err)
} else {
if err := repository.Initialize(configuration, logger); err != nil {

Wyświetl plik

@ -7,7 +7,6 @@ import (
"github.com/reiver/greatape/components/api/handlers"
"github.com/reiver/greatape/components/api/operations"
. "github.com/reiver/greatape/components/constants"
. "github.com/reiver/greatape/components/contracts"
"github.com/reiver/greatape/components/core"
"github.com/reiver/greatape/components/model/repository"
"github.com/reiver/greatape/providers/outbound/email"
@ -39,7 +38,7 @@ func Run() {
emailProvider := email.NewProvider(logger)
smsProvider := sms.NewProvider(logger)
if mainServer, err := server.New(configuration, operationsFactory, handlersFactory, OPCODES); err != nil {
if mainServer, err := server.New(configuration, operationsFactory, handlersFactory); err != nil {
logger.Fatal(err)
} else {
if err := repository.Initialize(configuration, logger); err != nil {

Wyświetl plik

@ -6,13 +6,14 @@ import (
"reflect"
"time"
. "github.com/reiver/greatape/components/api/protobuf"
. "github.com/reiver/greatape/components/contracts"
. "github.com/xeronith/diamante/client"
. "github.com/xeronith/diamante/contracts/client"
. "github.com/xeronith/diamante/contracts/logging"
. "github.com/xeronith/diamante/contracts/operation"
. "github.com/xeronith/diamante/contracts/system"
. "github.com/xeronith/diamante/protobuf"
. "github.com/xeronith/diamante/serialization"
. "github.com/xeronith/diamante/server"
)
@ -48,7 +49,7 @@ func NewApi(endpoint string, logger ILogger) IApi {
logger: logger,
}
api.client.SetBinaryOperationResultListener(api.handler)
api.client.SetOperationResultListener(api.handler)
return api
}
@ -63,7 +64,7 @@ func (api *api) SetDebugMode(enabled bool) {
func (api *api) call(operation uint64, payload Pointer) (Pointer, error) {
requestId := uint64(time.Now().UnixNano())
if api.debugMode {
api.logger.Debug(fmt.Sprintf("REQ { ID: %d, OP: %s }", requestId, OPCODES[operation]))
api.logger.Debug(fmt.Sprintf("REQ { ID: %d, OP: %d }", requestId, operation))
}
if err := api.client.Send(requestId, operation, payload); err != nil {
@ -72,13 +73,13 @@ func (api *api) call(operation uint64, payload Pointer) (Pointer, error) {
result := <-api.output
if result.isError {
return nil, errors.New(result.payload.(*Error).Message)
return nil, errors.New(result.payload.(*ServerError).Message)
}
return result.payload, nil
}
func (api *api) handler(bundle IBinaryOperationResult) {
func (api *api) handler(bundle IOperationResult) {
isError := false
var result Pointer
@ -89,14 +90,14 @@ func (api *api) handler(bundle IBinaryOperationResult) {
} else {
switch bundle.Type() {
case ERROR:
result = new(Error)
result = new(ServerError)
isError = true
default:
api.logger.Fatal("unregistered_result_type")
}
}
if err := DefaultBinarySerializer.Deserialize(bundle.Payload(), result); err != nil {
if err := NewProtobufSerializer().Deserialize(bundle.Payload(), result); err != nil {
api.logger.Fatal(err)
}

Wyświetl plik

@ -39,7 +39,7 @@ func TestMain(main *testing.M) {
emailProvider := email.NewProvider(logger)
smsProvider := sms.NewProvider(logger)
if testServer, err := server.New(configuration, operationsFactory, handlersFactory, OPCODES); err != nil {
if testServer, err := server.New(configuration, operationsFactory, handlersFactory); err != nil {
logger.Fatal(err)
} else {
if err := repository.Initialize(configuration, logger); err != nil {