fix: missing initialization

gnoswap-labs · Dec 20, 2024 · af4492a · af4492a
1 parent e211945
commit af4492a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 18 deletions.
diff --git a/_deploy/r/gnoswap/gns/_helper_test.gno b/_deploy/r/gnoswap/gns/_helper_test.gno
@@ -35,22 +35,9 @@ func resetGnsTokenObject(t *testing.T) {
 func resetHalvingRelatedObject(t *testing.T) {
 	t.Helper()
 
-	for year := int64(1); year < 13; year++ {
-		setHalvingYearMaxAmount(year, HALVING_AMOUNTS_PER_YEAR[year-1])
-
-		if year == 1 {
-			setHalvingYearAccuAmount(year, HALVING_AMOUNTS_PER_YEAR[year-1])
-		} else {
-			setHalvingYearAccuAmount(year, GetHalvingYearAccuAmount(year-1)+HALVING_AMOUNTS_PER_YEAR[year-1])
-		}
-
-		setHalvingYearStartBlock(year, startHeight+blockPerYear*year)
-		setHalvingYearTimestamp(year, startTimestamp+(consts.TIMESTAMP_YEAR*year))
-		setHalvingYearMintAmount(year, uint64(0))
-
-		amountPerYear := GetHalvingYearMaxAmount(year)       // amount per year
-		amountPerDay := amountPerYear / consts.DAY_PER_YEAR  // amount per day
-		amountPerBlock := amountPerDay / uint64(blockPerDay) // amount per block
-		setAmountPerBlockPerHalvingYear(year, uint64(amountPerBlock))
-	}
+	startHeight = std.GetHeight()
+	startTimestamp = time.Now().Unix()
+
+	initializeHalvingData()
+	setEndTimestamp(startTimestamp + consts.TIMESTAMP_YEAR*HALVING_END_YEAR)
 }
diff --git a/_deploy/r/gnoswap/gns/halving.gno b/_deploy/r/gnoswap/gns/halving.gno
@@ -109,6 +109,8 @@ func initializeHalvingData() {
 		amountPerDay := currentYearMaxAmount / consts.DAY_PER_YEAR
 		amountPerBlock := amountPerDay / uint64(blockPerDay)
 		setAmountPerBlockPerHalvingYear(year, uint64(amountPerBlock))
+
+		setHalvingYearMintAmount(year, uint64(0))
 	}
 }