use decimal

x/mint/minter.go

@@ -11,12 +11,12 @@ import (
 type Minter struct {
 	LastUpdate       time.Time `json:"last_update"`       // time which the last update was made to the minter
 	Inflation        sdk.Dec   `json:"inflation"`         // current annual inflation rate
-	AnnualProvisions sdk.Int   `json:"annual_provisions"` // current annual expected provisions
+	AnnualProvisions sdk.Dec   `json:"annual_provisions"` // current annual expected provisions
 }
 
 // Create a new minter object
-func NewMinter(lastUpdate time.Time, inflation sdk.Dec,
-	annualProvisions sdk.Int) Minter {
+func NewMinter(lastUpdate time.Time, inflation,
+	annualProvisions sdk.Dec) Minter {
 
 	return Minter{
 		LastUpdate:       lastUpdate,
@@ -30,7 +30,7 @@ func InitialMinter(inflation sdk.Dec) Minter {
 	return NewMinter(
 		time.Unix(0, 0),
 		inflation,
-		sdk.NewInt(0),
+		sdk.NewDec(0),
 	)
 }
 
@@ -81,14 +81,13 @@ func (m Minter) NextInflationRate(params Params, bondedRatio sdk.Dec) (
 
 // calculate the annual provisions based on current total supply and inflation rate
 func (m Minter) NextAnnualProvisions(params Params, totalSupply sdk.Dec) (
-	provisions sdk.Int) {
+	provisions sdk.Dec) {
 
-	provisionsDec := m.Inflation.Mul(totalSupply)
-	return provisionsDec.TruncateInt()
+	return m.Inflation.Mul(totalSupply)
 }
 
 // get the provisions for a block based on the annual provisions rate
 func (m Minter) BlockProvision(params Params) sdk.Coin {
-	provisionAmt := m.AnnualProvisions.DivRaw(int64(params.BlocksPerYear))
-	return sdk.NewCoin(params.MintDenom, provisionAmt)
+	provisionAmt := m.AnnualProvisions.QuoInt(sdk.NewInt(int64(params.BlocksPerYear)))
+	return sdk.NewCoin(params.MintDenom, provisionAmt.TruncateInt())
 }

x/mint/minter_test.go

@@ -69,7 +69,7 @@ func TestBlockProvision(t *testing.T) {
 		{(secondsPerYear / 5) / 2, 0},
 	}
 	for i, tc := range tests {
-		minter.AnnualProvisions = sdk.NewInt(tc.annualProvisions)
+		minter.AnnualProvisions = sdk.NewDec(tc.annualProvisions)
 		provisions := minter.BlockProvision(params)
 
 		expProvisions := sdk.NewCoin(params.MintDenom,
@@ -81,15 +81,19 @@ func TestBlockProvision(t *testing.T) {
 	}
 }
 
-// using sdk.Int operations:
+// Benchmarking :)
+// previously using sdk.Int operations:
 // BenchmarkBlockProvision-4 5000000 220 ns/op
+//
+// using sdk.Dec operations: (current implementation)
+// BenchmarkBlockProvision-4 3000000 429 ns/op
 func BenchmarkBlockProvision(b *testing.B) {
 	minter := InitialMinter(sdk.NewDecWithPrec(1, 1))
 	params := DefaultParams()
 
 	s1 := rand.NewSource(100)
 	r1 := rand.New(s1)
-	minter.AnnualProvisions = sdk.NewInt(r1.Int63n(1000000))
+	minter.AnnualProvisions = sdk.NewDec(r1.Int63n(1000000))
 
 	// run the Fib function b.N times
 	for n := 0; n < b.N; n++ {