Feat/v3

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/code-coverage.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/create_release.yml

@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
         id: go
 
       - name: Check out code into the Go module directory

.github/workflows/golangci-lint.yml

@@ -13,13 +13,13 @@ jobs:
     steps:
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.45.2
+          version: v1.53.2
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

.github/workflows/pr-tests.yml

@@ -8,13 +8,13 @@ on:
 
 jobs:
   test:
-    name: Unit
+    name: Unit & Integration
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17.6
+          go-version: 1.20.7
         id: go
 
       - name: Check out code

.github/workflows/slow-tests.yml

@@ -0,0 +1,27 @@
+name: Tests
+
+on:
+  push:
+    branches: [ main, feat/* ]
+  pull_request:
+    branches: [ main, feat/* ]
+
+jobs:
+  test:
+    name: Slow
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.20.7
+        id: go
+
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Get dependencies
+        run: |
+          go get -v -t -d ./...
+      - name: Slow tests
+        run: make slow-tests

.gitignore

@@ -21,6 +21,8 @@
 /esdata
 .env
 *.log
+# prevent accidental commit of key files
+*.pem
 
 mytestnet/**
 

Makefile

@@ -8,11 +8,7 @@ build-cmd:
 	(cd cmd && go build)
 
 clean-test:
-	go clean -testcache ./...
-
-clean: clean-test
-	go clean -cache ./...
-	go clean ./...
+	go clean -testcache
 
 test: clean-test
 	go test ./...
@@ -21,6 +17,11 @@ test-coverage:
 	@echo "Running unit tests"
 	CURRENT_DIRECTORY=$(CURRENT_DIRECTORY) go test -cover -coverprofile=coverage.txt -covermode=atomic -v ${TESTS_TO_RUN}
 
+slow-tests: clean-test
+	@docker compose -f docker/docker-compose.yml build
+	@docker compose -f docker/docker-compose.yml up & go test ./integrationTests/... -v -timeout 40m -tags slow
+	@docker compose -f docker/docker-compose.yml down -v
+
 lint-install:
 ifeq (,$(wildcard test -f bin/golangci-lint))
 	@echo "Installing golint"

api/gin/webServer.go

@@ -30,14 +30,14 @@ var log = logger.GetOrCreate("api")
 type ArgsNewWebServer struct {
 	Facade          shared.FacadeHandler
 	ApiConfig       config.ApiRoutesConfig
-	AntiFloodConfig config.AntifloodConfig
+	AntiFloodConfig config.WebAntifloodConfig
 }
 
 type webServer struct {
 	sync.RWMutex
 	facade          shared.FacadeHandler
 	apiConfig       config.ApiRoutesConfig
-	antiFloodConfig config.AntifloodConfig
+	antiFloodConfig config.WebAntifloodConfig
 	httpServer      chainShared.HttpServerCloser
 	groups          map[string]shared.GroupHandler
 	cancelFunc      func()
@@ -116,9 +116,9 @@ func (ws *webServer) StartHttpServer() error {
 
 	ws.registerRoutes(engine)
 
-	server := &http.Server{Addr: ws.facade.RestApiInterface(), Handler: engine}
+	serverInstance := &http.Server{Addr: ws.facade.RestApiInterface(), Handler: engine}
 	log.Debug("creating gin web sever", "interface", ws.facade.RestApiInterface())
-	ws.httpServer, err = NewHttpServer(server)
+	ws.httpServer, err = NewHttpServer(serverInstance)
 	if err != nil {
 		return err
 	}

api/gin/webServer_test.go

@@ -34,7 +34,7 @@ func createMockArgsNewWebServer() ArgsNewWebServer {
 			},
 			APIPackages: make(map[string]config.APIPackageConfig),
 		},
-		AntiFloodConfig: config.AntifloodConfig{
+		AntiFloodConfig: config.WebAntifloodConfig{
 			Enabled: true,
 			WebServer: config.WebServerAntifloodConfig{
 				SimultaneousRequests:         1,