change epoch id

mycel-labs · Sep 20, 2023 · 0096e16 · 0096e16
1 parent e3d6229
commit 0096e16
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/x/epochs/keeper/hooks_test.go b/x/epochs/keeper/hooks_test.go
@@ -12,7 +12,7 @@ import (
 type MockHooks struct{}
 
 const (
-	EpochIdentifier           = types.DayEpochId
+	EpochIdentifier           = types.DailyEpochId
 	BeforeEpochStartEventType = "BeforeEpochStart"
 	AfterEpochEndEventType    = "AfterEpochEnd"
 )
@@ -73,7 +73,7 @@ func (suite *KeeperTestSuite) TestAfterEpochHooks() {
 				suite.app.EpochsKeeper.BeginBlocker(suite.ctx)
 
 				// Check if curent epoch is expected
-				epochInfo, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DayEpochId)
+				epochInfo, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DailyEpochId)
 				suite.Require().True(found)
 				suite.Require().Equal(int64(2), epochInfo.CurrentEpoch)
 			},
@@ -101,7 +101,7 @@ func (suite *KeeperTestSuite) TestAfterEpochHooks() {
 				suite.app.EpochsKeeper.BeginBlocker(suite.ctx)
 
 				// Check if curent epoch is expected
-				epochInfo, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DayEpochId)
+				epochInfo, found := suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DailyEpochId)
 				suite.Require().True(found)
 				suite.Require().Equal(int64(2), epochInfo.CurrentEpoch)
 
@@ -110,7 +110,7 @@ func (suite *KeeperTestSuite) TestAfterEpochHooks() {
 				suite.app.EpochsKeeper.BeginBlocker(suite.ctx)
 
 				// Check if curent epoch is expected
-				epochInfo, found = suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DayEpochId)
+				epochInfo, found = suite.app.EpochsKeeper.GetEpochInfo(suite.ctx, types.DailyEpochId)
 				suite.Require().True(found)
 				suite.Require().Equal(int64(3), epochInfo.CurrentEpoch)
 			},

diff --git a/x/epochs/types/epoch_identifier.go b/x/epochs/types/epoch_identifier.go
@@ -1,6 +1,6 @@
 package types
 
 const (
-	WeekEpochId = "week"
-	DayEpochId = "day"
+	WeeklyEpochId = "weekly"
+	DailyEpochId = "daily"
 )
diff --git a/x/epochs/types/epoch_info_test.go b/x/epochs/types/epoch_info_test.go
@@ -52,7 +52,7 @@ func (suite *EpochInfoTestSuite) TestValidateEpochInfo() {
 		{
 			ErrEpochDurationCannotBeZero,
 			EpochInfo{
-				IncentiveEpochId,
+				DailyEpochId,
 				time.Now(),
 				time.Hour * 0,
 				1,
@@ -65,7 +65,7 @@ func (suite *EpochInfoTestSuite) TestValidateEpochInfo() {
 		{
 			ErrCurrentEpochCannotBeNegative,
 			EpochInfo{
-				IncentiveEpochId,
+				DailyEpochId,
 				time.Now(),
 				time.Hour * 24,
 				-1,
@@ -78,7 +78,7 @@ func (suite *EpochInfoTestSuite) TestValidateEpochInfo() {
 		{
 			ErrCurrentEpochStartHeightCannotBeNegative,
 			EpochInfo{
-				IncentiveEpochId,
+				DailyEpochId,
 				time.Now(),
 				time.Hour * 24,
 				1,
@@ -91,7 +91,7 @@ func (suite *EpochInfoTestSuite) TestValidateEpochInfo() {
 		{
 			nil,
 			EpochInfo{
-				IncentiveEpochId,
+				DailyEpochId,
 				time.Now(),
 				time.Hour * 24,
 				1,

diff --git a/x/epochs/types/genesis.go b/x/epochs/types/genesis.go
@@ -19,7 +19,7 @@ func DefaultGenesis() *GenesisState {
 	return &GenesisState{
 		Epochs: []EpochInfo{
 			{
-				Identifier:              WeekEpochId,
+				Identifier:              WeeklyEpochId,
 				StartTime:               time.Time{},
 				Duration:                time.Hour * 24 * 7,
 				CurrentEpoch:            0,
@@ -28,7 +28,7 @@ func DefaultGenesis() *GenesisState {
 				EpochCountingStarted:    false,
 			},
 			{
-				Identifier:              DayEpochId,
+				Identifier:              DailyEpochId,
 				StartTime:               time.Time{},
 				Duration:                time.Hour * 24,
 				CurrentEpoch:            0,

diff --git a/x/epochs/types/genesis_test.go b/x/epochs/types/genesis_test.go
@@ -38,7 +38,7 @@ func (suite *GenesisTestSuite) TestValidateGenesis() {
 			&GenesisState{
 				Epochs: []EpochInfo{
 					{
-						Identifier:              IncentiveEpochId,
+						Identifier:              DailyEpochId,
 						StartTime:               time.Time{},
 						Duration:                time.Hour * 24 * 7,
 						CurrentEpoch:            0,
@@ -55,7 +55,7 @@ func (suite *GenesisTestSuite) TestValidateGenesis() {
 			&GenesisState{
 				Epochs: []EpochInfo{
 					{
-						Identifier:              IncentiveEpochId,
+						Identifier:              DailyEpochId,
 						StartTime:               time.Time{},
 						Duration:                time.Hour * 24 * 7,
 						CurrentEpoch:            0,
@@ -64,7 +64,7 @@ func (suite *GenesisTestSuite) TestValidateGenesis() {
 						EpochCountingStarted:    false,
 					},
 					{
-						Identifier:              IncentiveEpochId,
+						Identifier:              DailyEpochId,
 						StartTime:               time.Time{},
 						Duration:                time.Hour * 24 * 7,
 						CurrentEpoch:            0,