Mirroristas/planetmint-go
2
0
Fork 0
mirror of https://github.com/planetmint/planetmint-go.git synced 2025-06-25 07:22:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed precsion issue within the distribution order (#229)

Browse Source 
* fixed precision issue within the distribution order
* adjusted test cases: migrated from uint64 to float64
---------

Signed-off-by: Jürgen Eckel <juergen@riddleandcode.com>
This commit is contained in:
Jürgen Eckel 2023-12-12 13:15:14 +01:00 committed by GitHub
parent 7b381f3313
commit 3c1a2fa776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x/dao/keeper/distribution.go
View File

@ -1,7 +1,6 @@
package keeper package keeper
import ( import (
"strconv"
"strings" "strings"
"github.com/cosmos/cosmos-sdk/store/prefix" "github.com/cosmos/cosmos-sdk/store/prefix"
@ -68,9 +67,9 @@ func ComputeDistribution(lastReissuance int64, blockHeight int64, amount uint64)
distribution.InvestorAddr = conf.DistributionAddrInv distribution.InvestorAddr = conf.DistributionAddrInv
distribution.PopAddr = conf.DistributionAddrPop distribution.PopAddr = conf.DistributionAddrPop
distribution.DaoAmount = strconv.FormatUint(uint64(float64(amount)*types.PercentageDao), 10) distribution.DaoAmount = util.UintValueToRDDLTokenString(uint64(float64(amount) * types.PercentageDao))
distribution.InvestorAmount = strconv.FormatUint(uint64(float64(amount)*types.PercentageInvestor), 10) distribution.InvestorAmount = util.UintValueToRDDLTokenString(uint64(float64(amount) * types.PercentageInvestor))
distribution.PopAmount = strconv.FormatUint(uint64(float64(amount)*types.PercentagePop), 10) distribution.PopAmount = util.UintValueToRDDLTokenString(uint64(float64(amount) * types.PercentagePop))
return distribution return distribution
} }

25
x/dao/keeper/distribution_test.go
View File

@ -48,36 +48,37 @@ func TestDistributionOrder(t *testing.T) {
func TestTokenDistribution(t *testing.T) { func TestTokenDistribution(t *testing.T) {
t.Parallel() t.Parallel()
k, ctx := keepertest.DaoKeeper(t) k, ctx := keepertest.DaoKeeper(t)
var reissuanceValue uint64 = 99869000000 reissuanceValue := 998.69000000
reissuances := 1000 reissuances := 1000
var Amount1stBatch uint64 = 781 Amount1stBatch := 781.0
var Amount2ndBatch uint64 = 219 Amount2ndBatch := 219.0
_ = createNReissuances(k, ctx, reissuances) _ = createNReissuances(k, ctx, reissuances)
distribution, err := k.GetDistributionForReissuedTokens(ctx, 780) distribution, err := k.GetDistributionForReissuedTokens(ctx, 780)
assert.Nil(t, err) assert.Nil(t, err)
amount1, err1 := strconv.ParseUint(distribution.DaoAmount, 10, 64)
amount2, err2 := strconv.ParseUint(distribution.InvestorAmount, 10, 64) amount1, err1 := strconv.ParseFloat(distribution.DaoAmount, 64)
amount3, err3 := strconv.ParseUint(distribution.PopAmount, 10, 64) amount2, err2 := strconv.ParseFloat(distribution.InvestorAmount, 64)
amount3, err3 := strconv.ParseFloat(distribution.PopAmount, 64)
assert.Nil(t, err1) assert.Nil(t, err1)
assert.Nil(t, err2) assert.Nil(t, err2)
assert.Nil(t, err3) assert.Nil(t, err3)
sum := amount1 + amount2 + amount3 sum := amount1 + amount2 + amount3
expSum := reissuanceValue * Amount1stBatch // add the [0] of the expSum := reissuanceValue * Amount1stBatch // add the [0] of the
assert.Equal(t, expSum, sum) assert.True(t, expSum-sum < 0.000001)
var lastDistribution types.DistributionOrder var lastDistribution types.DistributionOrder
lastDistribution.LastPop = 780 lastDistribution.LastPop = 780
k.StoreDistributionOrder(ctx, lastDistribution) k.StoreDistributionOrder(ctx, lastDistribution)
lastDistribution, err0 := k.GetDistributionForReissuedTokens(ctx, 999) lastDistribution, err0 := k.GetDistributionForReissuedTokens(ctx, 999)
assert.Nil(t, err0) assert.Nil(t, err0)
amount1, err1 = strconv.ParseUint(lastDistribution.DaoAmount, 10, 64) amount1, err1 = strconv.ParseFloat(lastDistribution.DaoAmount, 64)
amount2, err2 = strconv.ParseUint(lastDistribution.InvestorAmount, 10, 64) amount2, err2 = strconv.ParseFloat(lastDistribution.InvestorAmount, 64)
amount3, err3 = strconv.ParseUint(lastDistribution.PopAmount, 10, 64) amount3, err3 = strconv.ParseFloat(lastDistribution.PopAmount, 64)
assert.Nil(t, err1) assert.Nil(t, err1)
assert.Nil(t, err2) assert.Nil(t, err2)
assert.Nil(t, err3) assert.Nil(t, err3)
sum = amount1 + amount2 + amount3 sum = amount1 + amount2 + amount3
expSum = reissuanceValue * Amount2ndBatch // add the [0] of the expSum = reissuanceValue * Amount2ndBatch // add the [0] of the
assert.Equal(t, expSum, sum) assert.True(t, expSum-sum < 0.000001)
assert.Equal(t, uint64(reissuances), Amount1stBatch+Amount2ndBatch) assert.Equal(t, float64(reissuances), Amount1stBatch+Amount2ndBatch)
} }