update

CHANGELOG.md

@@ -9,13 +9,14 @@
 ### IMPROVEMENTS
 
 - Update `cmd/hidden_lake/composites`: rewriting composites -> composite
+- Update `go-peer`: fix all warning with 'golangci-lint run -E "ineffassign,unparam,unused,bodyclose,noctx,perfsprint,prealloc,gocritic,govet,revive,staticcheck"'
 
 ### CHANGES
 
 - Update `cmd/hidden_lake/applications/messenger|filesharer`: move config option 'language' to settings
 - Update `cmd/hidden_lake/applications/messenger`: move config options 'pseudonym', 'storage_key' to settings
 - Update `internal/flag`: delete os.Args implementations
-- Update `go-peer`: fix all warning with 'golangci-lint run -E "ineffassign,unparam,unused,bodyclose,noctx,perfsprint,prealloc,gocritic,govet,revive,staticcheck"', 
+- Update `pkg/network/conn_keeper`: rename to connkeeper
 
 ### BUG FIXES
 
@@ -580,7 +581,7 @@
 
 - Makefiles `cmd`: change CGO_ENABLED=1 -> CGO_ENABLED=0
 - Tests `make test`: replace race modifier from test-run to test-race
-- Package `conn_keeper`: tryConnectToAll "for range map" -> "_, ok := map by key-address"
+- Package `connkeeper`: tryConnectToAll "for range map" -> "_, ok := map by key-address"
 - Package `network/conn`: append wait read deadline method
 - Docs `README.md`: Append 'Calling functions/methods' to code style go-peer
 - Package `storage`: Change ISettings, delete ISettings from storage/database

TODO.md

@@ -8,11 +8,8 @@
 6. Append errors (as traffic/database) for all interface methods
 7. Append Batch's to database
 8. Config logging structure -> move to internal/
-9. HLC: append ports to dockerfile
-10. Rewrite some examples into HLC implementation
-11. Custom Unmarshal with fields 
-12. Rename conn_keeper -> connkeeper
-13. golint: "errcheck,errorlint,goerr113,wrapcheck", "cyclop,funlen,gocognit,gocyclo,maintidx,nestif", 
+9. Custom Unmarshal with fields 
+10. golint: "errcheck,errorlint,goerr113,wrapcheck", "cyclop,funlen,gocognit,gocyclo,maintidx,nestif", 
 
 ### Tests
 

cmd/hidden_lake/applications/filesharer/Makefile

@@ -33,7 +33,7 @@ docker-configs:
 	mkdir ./_mounted | true 
 	cp $(ROOPATH)/cmd/hidden_lake/_configs/docker/* ./_mounted
 docker-run:
-	docker run -it --rm -v $$(pwd)/_mounted:/mounted -p 9591:9591 -p 9592:9592 hl_filesharer
+	docker run -it --rm -v $$(pwd)/_mounted:/mounted -p 9541:9541 -p 9542:9542 hl_filesharer
 docker-clean:
 	rm -rf ./_mounted/hlf.*
 	docker rmi hl_filesharer

cmd/hidden_lake/composite/Makefile

@@ -32,6 +32,14 @@ docker-run:
 	docker run -it --rm -v $$(pwd)/_mounted:/mounted \
 		-p 9571:9571 \
 		-p 9572:9572 \
+		-p 9551:9551 \
+		-p 9541:9541 \
+		-p 9542:9542 \
+		-p 9561:9561 \
+		-p 9591:9591 \
+		-p 9592:9592 \
+		-p 9581:9581 \
+		-p 9582:9582 \
 		hl_composite
 docker-clean:
 	rm -rf ./_mounted/hl?.* priv.key

cmd/hidden_lake/helpers/traffic/Makefile

@@ -33,7 +33,7 @@ docker-configs:
 	mkdir ./_mounted | true 
 	cp $(ROOPATH)/cmd/hidden_lake/_configs/docker/* ./_mounted
 docker-run:
-	docker run -it --rm -v $$(pwd)/_mounted:/mounted -p 9581:9581 hl_traffic
+	docker run -it --rm -v $$(pwd)/_mounted:/mounted -p 9581:9581 -p 9582:9582 hl_traffic
 docker-clean:
 	rm -rf ./_mounted/hlt.*
 	docker rmi hl_traffic

cmd/hidden_lake/helpers/traffic/internal/handler/handler_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/number571/go-peer/pkg/logger"
 	"github.com/number571/go-peer/pkg/network"
 	"github.com/number571/go-peer/pkg/network/conn"
-	"github.com/number571/go-peer/pkg/network/conn_keeper"
+	"github.com/number571/go-peer/pkg/network/connkeeper"
 	net_message "github.com/number571/go-peer/pkg/network/message"
 	"github.com/number571/go-peer/pkg/types"
 	testutils "github.com/number571/go-peer/test/utils"
@@ -74,10 +74,10 @@ func testAllFree(addr string, srv *http.Server, cancel context.CancelFunc, wDB d
 	_ = closer.CloseAll([]types.ICloser{srv, wDB})
 }
 
-func testRunService(wDB database.IDBWrapper, addr string, addrNode string) (*http.Server, conn_keeper.IConnKeeper, context.CancelFunc) {
+func testRunService(wDB database.IDBWrapper, addr string, addrNode string) (*http.Server, connkeeper.IConnKeeper, context.CancelFunc) {
 	mux := http.NewServeMux()
 
-	connKeeperSettings := &conn_keeper.SSettings{
+	connKeeperSettings := &connkeeper.SSettings{
 		FDuration: time.Minute,
 		FConnections: func() []string {
 			return nil
@@ -90,8 +90,8 @@ func testRunService(wDB database.IDBWrapper, addr string, addrNode string) (*htt
 		}
 	}
 
-	connKeeper := conn_keeper.NewConnKeeper(
-		conn_keeper.NewSettings(connKeeperSettings),
+	connKeeper := connkeeper.NewConnKeeper(
+		connkeeper.NewSettings(connKeeperSettings),
 		testNewNetworkNode("").HandleFunc(
 			1, // default value
 			func(_ context.Context, _ network.INode, _ conn.IConn, _ net_message.IMessage) error {

cmd/hidden_lake/helpers/traffic/pkg/app/app.go

@@ -12,7 +12,7 @@ import (
 	"github.com/number571/go-peer/cmd/hidden_lake/helpers/traffic/internal/database"
 	"github.com/number571/go-peer/pkg/logger"
 	"github.com/number571/go-peer/pkg/network"
-	"github.com/number571/go-peer/pkg/network/conn_keeper"
+	"github.com/number571/go-peer/pkg/network/connkeeper"
 	"github.com/number571/go-peer/pkg/state"
 	"github.com/number571/go-peer/pkg/types"
 	"github.com/number571/go-peer/pkg/utils"
@@ -36,7 +36,7 @@ type sApp struct {
 	fConfig     config.IConfig
 	fDBWrapper  database.IDBWrapper
 	fNode       network.INode
-	fConnKeeper conn_keeper.IConnKeeper
+	fConnKeeper connkeeper.IConnKeeper
 
 	fAnonLogger logger.ILogger
 	fHTTPLogger logger.ILogger

cmd/hidden_lake/helpers/traffic/pkg/app/init_connkeeper.go

@@ -3,14 +3,14 @@ package app
 import (
 	"github.com/number571/go-peer/cmd/hidden_lake/helpers/traffic/internal/config"
 	"github.com/number571/go-peer/pkg/network"
-	"github.com/number571/go-peer/pkg/network/conn_keeper"
+	"github.com/number571/go-peer/pkg/network/connkeeper"
 
 	hls_settings "github.com/number571/go-peer/cmd/hidden_lake/service/pkg/settings"
 )
 
-func initConnKeeper(pCfg config.IConfig, pNode network.INode) conn_keeper.IConnKeeper {
-	return conn_keeper.NewConnKeeper(
-		conn_keeper.NewSettings(&conn_keeper.SSettings{
+func initConnKeeper(pCfg config.IConfig, pNode network.INode) connkeeper.IConnKeeper {
+	return connkeeper.NewConnKeeper(
+		connkeeper.NewSettings(&connkeeper.SSettings{
 			FConnections: func() []string { return pCfg.GetConnections() },
 			FDuration:    hls_settings.CConnKeeperDuration,
 		}),

cmd/hidden_lake/service/pkg/app/app.go

@@ -13,7 +13,7 @@ import (
 	"github.com/number571/go-peer/pkg/crypto/asymmetric"
 	"github.com/number571/go-peer/pkg/logger"
 	"github.com/number571/go-peer/pkg/network/anonymity"
-	"github.com/number571/go-peer/pkg/network/conn_keeper"
+	"github.com/number571/go-peer/pkg/network/connkeeper"
 	"github.com/number571/go-peer/pkg/state"
 	"github.com/number571/go-peer/pkg/types"
 	"github.com/number571/go-peer/pkg/utils"
@@ -35,7 +35,7 @@ type sApp struct {
 
 	fCfgW       config.IWrapper
 	fNode       anonymity.INode
-	fConnKeeper conn_keeper.IConnKeeper
+	fConnKeeper connkeeper.IConnKeeper
 	fPrivKey    asymmetric.IPrivKey
 
 	fAnonLogger logger.ILogger

cmd/hidden_lake/service/pkg/app/init_connkeeper.go

@@ -3,14 +3,14 @@ package app
 import (
 	"github.com/number571/go-peer/cmd/hidden_lake/service/internal/config"
 	"github.com/number571/go-peer/pkg/network/anonymity"
-	"github.com/number571/go-peer/pkg/network/conn_keeper"
+	"github.com/number571/go-peer/pkg/network/connkeeper"
 
 	pkg_settings "github.com/number571/go-peer/cmd/hidden_lake/service/pkg/settings"
 )
 
-func initConnKeeper(pCfg config.IConfig, pNode anonymity.INode) conn_keeper.IConnKeeper {
-	return conn_keeper.NewConnKeeper(
-		conn_keeper.NewSettings(&conn_keeper.SSettings{
+func initConnKeeper(pCfg config.IConfig, pNode anonymity.INode) connkeeper.IConnKeeper {
+	return connkeeper.NewConnKeeper(
+		connkeeper.NewSettings(&connkeeper.SSettings{
 			FConnections: func() []string { return pCfg.GetConnections() },
 			FDuration:    pkg_settings.CConnKeeperDuration,
 		}),

pkg/network/conn_keeper/doc.go

@@ -1,2 +0,0 @@
-// Package conn_keeper allows you to periodically reconnect to the list of connections.
-package conn_keeper // nolint: revive

pkg/network/conn_keeper/errors.go

@@ -1,7 +0,0 @@
-package conn_keeper // nolint: revive
-
-import "errors"
-
-var (
-	ErrRunning = errors.New("conn_keeper running")
-)

pkg/network/connkeeper/connkeeper.go

@@ -1,4 +1,4 @@
-package conn_keeper // nolint: revive
+package connkeeper
 
 import (
 	"context"

pkg/network/connkeeper/connkeeper_test.go

@@ -1,4 +1,4 @@
-package conn_keeper // nolint: revive
+package connkeeper
 
 import (
 	"context"

pkg/network/connkeeper/doc.go

@@ -0,0 +1,2 @@
+// Package connkeeper allows you to periodically reconnect to the list of connections.
+package connkeeper

pkg/network/connkeeper/errors.go

@@ -0,0 +1,7 @@
+package connkeeper
+
+import "errors"
+
+var (
+	ErrRunning = errors.New("connkeeper running")
+)

pkg/network/connkeeper/settings.go

@@ -1,4 +1,4 @@
-package conn_keeper // nolint: revive
+package connkeeper
 
 import "time"
 

pkg/network/connkeeper/types.go

@@ -1,4 +1,4 @@
-package conn_keeper // nolint: revive
+package connkeeper
 
 import (
 	"time"