fix(core/gas): Add consumed API for GasMeter (#21443)

cosmos · Aug 29, 2024 · 41a9af7 · 41a9af7
1 parent 33c463e
commit 41a9af7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/core/gas/service.go b/core/gas/service.go
@@ -38,6 +38,7 @@ type Meter interface {
 	Consume(amount Gas, descriptor string) error
 	Refund(amount Gas, descriptor string) error
 	Remaining() Gas
+	Consumed() Gas
 	Limit() Gas
 }
 

diff --git a/core/testing/gas/service_mocks.go b/core/testing/gas/service_mocks.go
diff --git a/runtime/gas.go b/runtime/gas.go
@@ -36,6 +36,10 @@ func (cgm CoreGasmeter) Consume(amount gas.Gas, descriptor string) error {
 	return nil
 }
 
+func (cgm CoreGasmeter) Consumed() gas.Gas {
+	return cgm.gm.GasConsumed()
+}
+
 func (cgm CoreGasmeter) Refund(amount gas.Gas, descriptor string) error {
 	cgm.gm.RefundGas(amount, descriptor)
 	return nil
@@ -55,14 +59,14 @@ type SDKGasMeter struct {
 }
 
 func (gm SDKGasMeter) GasConsumed() storetypes.Gas {
-	return gm.gm.Remaining()
+	return gm.gm.Consumed()
 }
 
 func (gm SDKGasMeter) GasConsumedToLimit() storetypes.Gas {
 	if gm.IsPastLimit() {
 		return gm.gm.Limit()
 	}
-	return gm.gm.Remaining()
+	return gm.gm.Consumed()
 }
 
 func (gm SDKGasMeter) GasRemaining() storetypes.Gas {