Fix test & lint (#11)

* Fix test * Update golangci lint
evsamsonov · Jun 23, 2023 · 771e135 · 771e135
1 parent 99868d3
commit 771e135
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 5 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,4 +10,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.49.0
+          version: v1.53.3
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ lint:
 		-v ${GOPATH}/pkg/mod:/go/pkg/mod \
  		-v ${PWD}:/app \
  		-w /app \
-	    golangci/golangci-lint:v1.49.0 \
+	    golangci/golangci-lint:v1.53.3 \
 	    golangci-lint run -v --modules-download-mode=readonly
 
 test:

diff --git a/mock_broker_runner.go b/mock_broker_runner.go
diff --git a/trengin.go b/trengin.go
@@ -105,6 +105,12 @@ type Strategy interface {
 // Неожиданные типы приведут к ошибке и завершению работы Engine
 type Actions chan interface{}
 
+//go:generate docker run --rm -v ${PWD}:/app -w /app/ vektra/mockery --name BrokerRunner --inpackage --case snake
+type BrokerRunner interface {
+	Broker
+	Runner
+}
+
 //go:generate docker run --rm -v ${PWD}:/app -w /app/ vektra/mockery --name Broker --inpackage --case snake
 
 // Broker describes client for execution of trading operations.

diff --git a/trengin_test.go b/trengin_test.go
@@ -405,7 +405,7 @@ func TestEngine_doChangeConditionalOrder(t *testing.T) {
 func TestEngine_Run(t *testing.T) {
 	t.Run("context canceled", func(t *testing.T) {
 		strategy := &MockStrategy{}
-		broker := &MockBroker{}
+		broker := &MockBrokerRunner{}
 		ctx, cancel := context.WithCancel(context.Background())
 
 		strategy.On("Run", mock.Anything, mock.Anything).After(100 * time.Millisecond).Return(nil)
@@ -429,7 +429,7 @@ func TestEngine_Run(t *testing.T) {
 
 	t.Run("error received", func(t *testing.T) {
 		strategy := &MockStrategy{}
-		broker := &MockBroker{}
+		broker := &MockBrokerRunner{}
 		ctx := context.Background()
 
 		strategy.On("Run", mock.Anything, mock.Anything).After(1000 * time.Millisecond).Return(nil)
@@ -455,7 +455,7 @@ func TestEngine_Run(t *testing.T) {
 
 	t.Run("unknown action", func(t *testing.T) {
 		strategy := &MockStrategy{}
-		broker := &MockBroker{}
+		broker := &MockBrokerRunner{}
 		ctx := context.Background()
 
 		strategy.On("Run", mock.Anything, mock.MatchedBy(func(actions Actions) bool {