lint fix, merge fix

2018-11-21 02:02:15 -05:00
parent 70e60c2f30
commit 6fd3132e71
4 changed files with 4 additions and 7 deletions
@@ -65,9 +65,8 @@ func (g *basicGasMeter) Limit() Gas {
 func (g *basicGasMeter) GasConsumedToLimit() Gas {
 	if g.consumed > g.limit {
 		return g.limit
-	} else {
-		return g.consumed
 	}
+	return g.consumed
 }

 func (g *basicGasMeter) ConsumeGas(amount Gas, descriptor string) {