modify name level

fractalplatform · Jun 4, 2019 · 7b2deb7 · 7b2deb7
1 parent 31d064c
commit 7b2deb7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 25 deletions.
diff --git a/accountmanager/accountmanager.go b/accountmanager/accountmanager.go
@@ -122,7 +122,7 @@ func SetAccountNameConfig(config *Config) bool {
 	}
 
 	regexpStr := fmt.Sprintf("([a-z][a-z0-9]{%v,%v})", config.MainAccountNameMinLength-1, config.MainAccountNameMaxLength-1)
-	for i := 0; i < int(config.AccountNameLevel); i++ {
+	for i := 1; i < int(config.AccountNameLevel); i++ {
 		regexpStr += fmt.Sprintf("(?:\\.([a-z0-9]{%v,%v})){0,1}", config.SubAccountNameMinLength, config.SubAccountNameMaxLength)
 	}
 

diff --git a/accountmanager/config.go b/accountmanager/config.go
@@ -26,16 +26,4 @@ type Config struct {
 	SubAccountNameMaxLength  uint64 `json:"subAccountNameMaxLength"`
 }
 
-// DefaultAccountNameConf return account config
-func DefaultAccountNameConf() *Config {
-	return &Config{
-		AccountNameLevel:         0,
-		AccountNameMaxLength:     31,
-		MainAccountNameMinLength: 7,
-		MainAccountNameMaxLength: 16,
-		SubAccountNameMinLength:  2,
-		SubAccountNameMaxLength:  0,
-	}
-}
-
 const MaxDescriptionLength uint64 = 255
diff --git a/asset/config.go b/asset/config.go
@@ -26,16 +26,4 @@ type Config struct {
 	SubAssetNameMaxLength  uint64 `json:"subAssetNameMaxLength"`
 }
 
-// DefaultAssetNameConf return asset config
-func DefaultAssetNameConf() *Config {
-	return &Config{
-		AssetNameLevel:         1,
-		AssetNameLength:        31,
-		MainAssetNameMinLength: 2,
-		MainAssetNameMaxLength: 16,
-		SubAssetNameMinLength:  1,
-		SubAssetNameMaxLength:  8,
-	}
-}
-
 const MaxDescriptionLength uint64 = 255