Move RegistrationPolicyType from TopLevelDomain to SubdomainConfig

mycel-labs · Dec 26, 2023 · a7b9845 · a7b9845
1 parent a29ebf2
commit a7b9845
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 142 deletions.
diff --git a/proto/mycel/registry/subdomain_config.proto b/proto/mycel/registry/subdomain_config.proto
@@ -6,6 +6,11 @@ import "mycel/registry/access_control.proto";
 
 option go_package = "github.com/mycel-domain/mycel/x/registry/types";
 
+enum RegistrationPolicyType {
+  PRIVATE = 0;
+  PUBLIC = 1;
+}
+
 message SubdomainRegistrationFees {
   repeated FeeByLength feeByLength = 1;
   repeated FeeByName feeByName = 2;
@@ -30,4 +35,5 @@ message SubdomainConfig {
   bool isRegistrable = 3;
   DomainRole registrableRole = 4;
   bool customExpirationDate = 5;
+  RegistrationPolicyType registrationPolicy = 6;
 }
diff --git a/proto/mycel/registry/top_level_domain.proto b/proto/mycel/registry/top_level_domain.proto
@@ -9,11 +9,6 @@ import "mycel/registry/subdomain_config.proto";
 
 option go_package = "github.com/mycel-domain/mycel/x/registry/types";
 
-enum RegistrationPolicyType {
-  PRIVATE = 0;
-  PUBLIC = 1;
-}
-
 message TopLevelDomain {
   string name = 1;
   google.protobuf.Timestamp expirationDate = 2
@@ -25,7 +20,6 @@ message TopLevelDomain {
     (gogoproto.nullable) = false,
     (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins"
   ];
-  RegistrationPolicyType registrationPolicy = 7;
 }
 
 message TopLevelDomainFee {

diff --git a/x/registry/keeper/events.go b/x/registry/keeper/events.go
@@ -101,7 +101,7 @@ func EmitUpdateTopLevelDomainRegistrationPolicyEvent(ctx sdk.Context, domain typ
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(types.EventTypeUpdateTopLevelDomainRegistrationPolicy,
 			sdk.NewAttribute(types.AttributeUpdateTopLevelDomainRegistrationPolicyEventDomainName, domain.Name),
-			sdk.NewAttribute(types.AttributeUpdateTopLevelDomainRegistrationPolicyEventRegistrationPolicy, domain.RegistrationPolicy.String()),
+			sdk.NewAttribute(types.AttributeUpdateTopLevelDomainRegistrationPolicyEventRegistrationPolicy, domain.SubdomainConfig.RegistrationPolicy.String()),
 		),
 	)
 }
diff --git a/x/registry/keeper/msg_server_update_top_level_domain_registration_policy_test.go b/x/registry/keeper/msg_server_update_top_level_domain_registration_policy_test.go
@@ -84,7 +84,7 @@ func (suite *KeeperTestSuite) TestUpdateTopLevelDomainRegistrationPolicy() {
 				// Check if the record is updated
 				suite.Require().Nil(err)
 				res, _ := suite.app.RegistryKeeper.GetTopLevelDomain(suite.ctx, tc.name)
-				suite.Require().Equal(tc.registrationPolicy, res.GetRegistrationPolicy().String())
+				suite.Require().Equal(tc.registrationPolicy, res.GetSubdomainConfig().RegistrationPolicy.String())
 				// Evalute events
 				events, found := testutil.FindEventsByType(suite.ctx.EventManager().Events(), types.EventTypeUpdateTopLevelDomainRegistrationPolicy)
 				suite.Require().True(found)

diff --git a/x/registry/keeper/second_level_domain.go b/x/registry/keeper/second_level_domain.go
@@ -194,7 +194,7 @@ func (k Keeper) ValidateSecondLevelDomainIsRegistrable(ctx sdk.Context, secondLe
 	}
 
 	// Check if the registering domain is allowed or not
-	isPrivate := parentDomain.RegistrationPolicy == types.RegistrationPolicyType_PRIVATE
+	isPrivate := parentDomain.SubdomainConfig.RegistrationPolicy == types.RegistrationPolicyType_PRIVATE
 	isOwner := parentDomain.GetRole(sldOwner.String()) == types.DomainRole_OWNER
 
 	if isPrivate && !isOwner {

diff --git a/x/registry/types/genesis.go b/x/registry/types/genesis.go
@@ -18,11 +18,11 @@ func GetDefaultTLDNames() []string {
 func GetDefaultTLDs() (defaultTLDs []TopLevelDomain) {
 	defaultRegistrationConfig := GetDefaultSubdomainConfig(3030)
 	defaultRegistrationConfig.MaxSubdomainRegistrations = math.MaxInt64
+	defaultRegistrationConfig.RegistrationPolicy = RegistrationPolicyType_PUBLIC
 	for _, v := range GetDefaultTLDNames() {
 		defaultTLDs = append(defaultTLDs, TopLevelDomain{
-			Name:               v,
-			SubdomainConfig:    &defaultRegistrationConfig,
-			RegistrationPolicy: RegistrationPolicyType_PUBLIC,
+			Name:            v,
+			SubdomainConfig: &defaultRegistrationConfig,
 		})
 	}
 	return defaultTLDs

diff --git a/x/registry/types/subdomain_config.go b/x/registry/types/subdomain_config.go
@@ -17,6 +17,7 @@ func GetDefaultSubdomainConfig(baseFee int64) SubdomainConfig {
 		SubdomainRegistrationFees: &SubdomainRegistrationFees{
 			DefaultFee: &defaultFee,
 		},
+		RegistrationPolicy: RegistrationPolicyType_PRIVATE,
 	}
 }
 

diff --git a/x/registry/types/subdomain_config.pb.go b/x/registry/types/subdomain_config.pb.go
diff --git a/x/registry/types/top_level_domain.go b/x/registry/types/top_level_domain.go
@@ -54,7 +54,7 @@ func (topLevelDomain *TopLevelDomain) ExtendExpirationDate(from time.Time, exten
 }
 
 func (topLevelDomain *TopLevelDomain) UpdateRegistrationPolicy(rp RegistrationPolicyType) {
-	topLevelDomain.RegistrationPolicy = rp
+	topLevelDomain.SubdomainConfig.RegistrationPolicy = rp
 }
 
 func (topLevelDomain TopLevelDomain) IsEditable(sender string) (isEditable bool, err error) {
-Original file line number
+Diff line change
@@ Expand Up @@
     		SubdomainRegistrationFees: &SubdomainRegistrationFees{
     			DefaultFee: &defaultFee,
     		},
+    		RegistrationPolicy: RegistrationPolicyType_PRIVATE,
     	}
     }
@@ Expand Down @@