From 4977599e87f8fc7d2bc9332d43ef170978726a85 Mon Sep 17 00:00:00 2001 From: netscrawler Date: Thu, 4 Jul 2024 07:27:31 +0300 Subject: [PATCH] v0.1.1 --- cmd/converter/main.go | 2 +- go.mod | 2 +- go.sum | 2 ++ internal/app/app.go | 4 +--- internal/services/converter/converter.go | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/converter/main.go b/cmd/converter/main.go index 04024c0..d92dd1e 100644 --- a/cmd/converter/main.go +++ b/cmd/converter/main.go @@ -27,7 +27,7 @@ func main() { log := setupLogger(cfg.Env) log.Info("starting application", slog.Any("cfg", cfg)) - applicaton := app.New(log, cfg.GRPC.Port, cfg.TokenTTL) + applicaton := app.New(log, cfg.GRPC.Port) go applicaton.GRPCSrv.MustRun() // TODO: инициализировать приложение app diff --git a/go.mod b/go.mod index e56c53c..4031436 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/redis/go-redis/v9 v9.5.3 // indirect golang.org/x/net v0.22.0 // indirect golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/text v0.16.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 3c7551d..3018b16 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,8 @@ golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 h1:NnYq6UN9ReLM9/Y01KWNOWyI5xQ9kbIms5GGJVwS/Yc= google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= diff --git a/internal/app/app.go b/internal/app/app.go index b4c6a74..0acd8a8 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -3,7 +3,6 @@ package app import ( grpcapp "converter/internal/app/grpc" "log/slog" - "time" ) type App struct { @@ -12,8 +11,7 @@ type App struct { func New( log *slog.Logger, - grpcPort int, - tokenTTl time.Duration) *App { + grpcPort int) *App { //TODO: инициализировать хранилище //TODO: init convert service diff --git a/internal/services/converter/converter.go b/internal/services/converter/converter.go index 305f05d..98fa44d 100644 --- a/internal/services/converter/converter.go +++ b/internal/services/converter/converter.go @@ -42,7 +42,6 @@ func (c *Converter) Convert( return 0, 0, fmt.Errorf("%s: %w", op, err) } - convertedAmount = uint32(float32(amount) * rate.Rate) - + convertedAmount = uint32(float32(amount) / rate.Rate) return convertedAmount, rate.Rate, nil }