update

number571 · Oct 14, 2023 · 565b838 · 565b838
1 parent 7f8f3ad
commit 565b838
Show file tree

Hide file tree

Showing 22 changed files with 21 additions and 76 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - Update `cmd/hidden_lake/messenger`: delete auth
 - Update `cmd/hidden_lake/service`: delete SetPrivKey/ResetPrivKey
 - Update `cmd/hidden_lake/service`: generates priv key file
+- Update `cmd/hidden_lake/*`: workSize, storageKey are can be null value
 
 ### BUG FIXES
 

diff --git a/README.md b/README.md
@@ -358,16 +358,14 @@ Default config `hlm.cfg`
 ```json
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": "127.0.0.1:9591",
 		"incoming": "127.0.0.1:9592"

diff --git a/cmd/hidden_lake/_default_cfg/docker/hlm.cfg b/cmd/hidden_lake/_default_cfg/docker/hlm.cfg
@@ -1,15 +1,13 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": ":9591",
 		"incoming": ":9592"

diff --git a/cmd/hidden_lake/_default_cfg/hlm.cfg b/cmd/hidden_lake/_default_cfg/hlm.cfg
@@ -1,15 +1,13 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": "127.0.0.1:9591",
 		"incoming": "127.0.0.1:9592"

diff --git a/cmd/hidden_lake/messenger/README.md b/cmd/hidden_lake/messenger/README.md
@@ -56,16 +56,14 @@ Default config `hlm.cfg`
 ```json
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": "127.0.0.1:9591",
 		"incoming": "127.0.0.1:9592"

diff --git a/cmd/hidden_lake/messenger/internal/config/config.go b/cmd/hidden_lake/messenger/internal/config/config.go
@@ -103,8 +103,7 @@ func (p *SConfigSettings) GetWorkSizeBits() uint64 {
 
 func (p *SConfig) isValid() bool {
 	return true &&
-		p.FSettings.FMessagesCapacity != 0 &&
-		p.FSettings.FWorkSizeBits != 0
+		p.FSettings.FMessagesCapacity != 0
 }
 
 func (p *SConfig) initConfig() error {

diff --git a/cmd/hidden_lake/messenger/internal/config/init.go b/cmd/hidden_lake/messenger/internal/config/init.go
@@ -16,11 +16,9 @@ func InitConfig(cfgPath string, initCfg *SConfig) (IConfig, error) {
 		initCfg = &SConfig{
 			FSettings: &SConfigSettings{
 				FMessagesCapacity: hlm_settings.CDefaultCapMessages,
-				FWorkSizeBits:     hlm_settings.CDefaultWorkSizeBits,
 			},
-			FLogging:    []string{logger.CLogInfo, logger.CLogWarn, logger.CLogErro},
-			FStorageKey: hlm_settings.CDefaultStorageKey,
-			FLanguage:   hlm_settings.CDefaultLanguage,
+			FLogging:  []string{logger.CLogInfo, logger.CLogWarn, logger.CLogErro},
+			FLanguage: hlm_settings.CDefaultLanguage,
 			FAddress: &SAddress{
 				FInterface: hlm_settings.CDefaultInterfaceAddress,
 				FIncoming:  hlm_settings.CDefaultIncomingAddress,

diff --git a/cmd/hidden_lake/messenger/pkg/settings/settings.go b/cmd/hidden_lake/messenger/pkg/settings/settings.go
@@ -16,9 +16,8 @@ const (
 )
 
 const (
-	CIamAliasName      = "__iam__"
-	CDefaultLanguage   = "ENG"
-	CDefaultStorageKey = "_"
+	CIamAliasName    = "__iam__"
+	CDefaultLanguage = "ENG"
 )
 
 const (
@@ -27,8 +26,7 @@ const (
 )
 
 const (
-	CDefaultWorkSizeBits = 20        // bits
-	CDefaultCapMessages  = (2 << 10) // count
+	CDefaultCapMessages = (2 << 10) // count
 )
 
 const (

diff --git a/cmd/hidden_lake/service/internal/config/config.go b/cmd/hidden_lake/service/internal/config/config.go
@@ -118,7 +118,6 @@ func (p *SConfig) GetSettings() IConfigSettings {
 func (p *SConfig) isValid() bool {
 	return true &&
 		p.FSettings.FMessageSizeBytes != 0 &&
-		p.FSettings.FWorkSizeBits != 0 &&
 		p.FSettings.FKeySizeBits != 0 &&
 		p.FSettings.FQueuePeriodMS != 0
 }

diff --git a/cmd/hidden_lake/traffic/internal/config/config.go b/cmd/hidden_lake/traffic/internal/config/config.go
@@ -111,7 +111,6 @@ func (p *SConfigSettings) GetLimitVoidSizeBytes() uint64 {
 func (p *SConfig) isValid() bool {
 	return true &&
 		p.FSettings.FMessageSizeBytes != 0 &&
-		p.FSettings.FWorkSizeBits != 0 &&
 		(p.FSettings.FMessagesCapacity != 0 || p.FSettings.FQueuePeriodMS != 0)
 }
 

diff --git a/cmd/hidden_lake/traffic/internal/database/settings.go b/cmd/hidden_lake/traffic/internal/database/settings.go
@@ -25,9 +25,6 @@ func (p *sSettings) mustNotNull() ISettings {
 	if p.FPath == "" {
 		panic(`p.FPath == ""`)
 	}
-	if p.FWorkSizeBits == 0 {
-		panic(`p.FWorkSizeBits == 0`)
-	}
 	if p.FMessageSizeBytes == 0 {
 		panic(`p.FMessageSizeBytes == 0`)
 	}

diff --git a/examples/anon_messenger/_docker/default/_mounted_node1/hlm.cfg b/examples/anon_messenger/_docker/default/_mounted_node1/hlm.cfg
@@ -1,15 +1,13 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": "messenger-node1:8080",
 		"incoming": "messenger-node1:8081"

diff --git a/examples/anon_messenger/_docker/default/_mounted_node2/hlm.cfg b/examples/anon_messenger/_docker/default/_mounted_node2/hlm.cfg
@@ -1,15 +1,13 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
 	"language": "ENG",
-	"storage_key": "_",
 	"address": {
 		"interface": "messenger-node2:7070",
 		"incoming": "messenger-node2:7071"

diff --git a/examples/anon_messenger/default/node1_hlm/hlm.cfg b/examples/anon_messenger/default/node1_hlm/hlm.cfg
@@ -1,14 +1,12 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
-	"storage_key": "_",
 	"address": {
 		"interface": "localhost:8080",
 		"incoming": "localhost:8081"

diff --git a/examples/anon_messenger/default/node2_hlm/hlm.cfg b/examples/anon_messenger/default/node2_hlm/hlm.cfg
@@ -1,14 +1,12 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
-	"storage_key": "_",
 	"address": {
 		"interface": "localhost:7070",
 		"incoming": "localhost:7071"

diff --git a/examples/anon_messenger/prod_test/node1_hlm/hlm.cfg b/examples/anon_messenger/prod_test/node1_hlm/hlm.cfg
@@ -1,14 +1,12 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
-	"storage_key": "_",
 	"address": {
 		"interface": "localhost:8080",
 		"incoming": "localhost:8081"

diff --git a/examples/anon_messenger/prod_test/node2_hlm/hlm.cfg b/examples/anon_messenger/prod_test/node2_hlm/hlm.cfg
@@ -1,14 +1,12 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"logging": [
 		"info",
 		"warn",
 		"erro"
 	],
-	"storage_key": "_",
 	"address": {
 		"interface": "localhost:7070",
 		"incoming": "localhost:7071"

diff --git a/examples/anon_messenger/secret_channel/node1_hlm/hlm.cfg b/examples/anon_messenger/secret_channel/node1_hlm/hlm.cfg
@@ -1,13 +1,11 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
 	"address": {
 		"interface": "localhost:8080",
 		"incoming": "localhost:8081"
 	},
-	"storage_key": "_",
 	"connection": "localhost:8572",
 	"backup_connections": [
 		"127.0.0.1:8573"

diff --git a/examples/anon_messenger/secret_channel/node2_hlm/hlm.cfg b/examples/anon_messenger/secret_channel/node2_hlm/hlm.cfg
@@ -1,9 +1,7 @@
 {
 	"settings": {
-		"messages_capacity": 2048,
-		"work_size_bits": 20
+		"messages_capacity": 2048
 	},
-	"storage_key": "_",
 	"address": {
 		"interface": "localhost:7070",
 		"incoming": "localhost:7071"

diff --git a/pkg/client/message/settings.go b/pkg/client/message/settings.go
@@ -18,9 +18,6 @@ func NewSettings(pSett *SSettings) ISettings {
 }
 
 func (p *sSettings) mustNotNull() ISettings {
-	if p.FWorkSizeBits == 0 {
-		panic(`p.FWorkSizeBits == 0`)
-	}
 	if p.FMessageSizeBytes == 0 {
 		panic(`p.FMessageSizeBytes == 0`)
 	}

diff --git a/pkg/storage/settings.go b/pkg/storage/settings.go
@@ -23,12 +23,6 @@ func (p *sSettings) mustNotNull() ISettings {
 	if p.FPath == "" {
 		panic(`p.FPath == ""`)
 	}
-	if p.FWorkSize == 0 {
-		panic(`p.FWorkSize == 0`)
-	}
-	if p.FPassword == "" {
-		panic(`p.FPassword == ""`)
-	}
 	return p
 }
 

diff --git a/pkg/storage/storage_test.go b/pkg/storage/storage_test.go
@@ -23,7 +23,7 @@ func TestCryptoStorage(t *testing.T) {
 }
 
 func TestSettings(t *testing.T) {
-	for i := 0; i < 3; i++ {
+	for i := 0; i < 1; i++ {
 		testSettings(t, i)
 	}
 }
@@ -37,20 +37,7 @@ func testSettings(t *testing.T, n int) {
 	}()
 	switch n {
 	case 0:
-		_ = NewSettings(&SSettings{
-			FWorkSize: testutils.TCWorkSize,
-			FPassword: "CIPHER",
-		})
-	case 1:
-		_ = NewSettings(&SSettings{
-			FPath:     "path",
-			FPassword: "CIPHER",
-		})
-	case 2:
-		_ = NewSettings(&SSettings{
-			FPath:     "path",
-			FWorkSize: testutils.TCWorkSize,
-		})
+		_ = NewSettings(&SSettings{})
 	}
 }