Merge pull request #459 from cybercongress/447-overall-karma

Fixed calculation of overall karma
cybercongress · Feb 6, 2020 · 878a4d3 · 878a4d3
2 parents dd956f2 + 5fb24d4
commit 878a4d3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/app.go b/app/app.go
@@ -445,6 +445,7 @@ func (app *CyberdApp) DeliverTx(req abci.RequestDeliverTx) (res abci.ResponseDel
 			}
 
 			app.bandwidthMeter.AddToBlockBandwidth(app.bandwidthMeter.GetTxCost(ctx, tx))
+			app.bandwidthMeter.AddToOverallKarma(linkingCost)
 
 			return abci.ResponseDeliverTx{
 				Code:      resp.GetCode(),

diff --git a/x/bandwidth/internal/types/meter.go b/x/bandwidth/internal/types/meter.go
@@ -19,6 +19,8 @@ type BandwidthMeter interface {
 	Load(ctx sdk.Context)
 	// add value to consumed bandwidth for current block
 	AddToBlockBandwidth(value int64)
+	// add value to overall linked bandwidth
+	AddToOverallKarma(value int64)
 	// adjust price based on 24h loading
 	AdjustPrice(ctx sdk.Context)
 	// get current bandwidth price

diff --git a/x/bandwidth/meter.go b/x/bandwidth/meter.go
@@ -67,6 +67,10 @@ func (m *BaseBandwidthMeter) AddToBlockBandwidth(value int64) {
 	m.curBlockSpentBandwidth += uint64(value)
 }
 
+func (m *BaseBandwidthMeter) AddToOverallKarma(value int64) {
+	m.bandwidthSpentLinking += uint64(value)
+}
+
 // Here we move bandwidth window:
 // Remove first block of window and add new block to window end
 func (m *BaseBandwidthMeter) CommitBlockBandwidth(ctx sdk.Context) {
@@ -87,7 +91,6 @@ func (m *BaseBandwidthMeter) CommitBlockBandwidth(ctx sdk.Context) {
 	}
 	m.blockBandwidthKeeper.SetBlockSpentBandwidth(ctx, uint64(ctx.BlockHeight()), m.curBlockSpentBandwidth)
 	m.bandwidthSpent[uint64(newWindowEnd)] = m.curBlockSpentBandwidth
-	m.bandwidthSpentLinking += m.curBlockSpentBandwidth
 	m.curBlockSpentBandwidth = 0
 }