refactor + error messages

uint · uint · commit 8232a4118e9a · 2021-06-24T15:14:09.000+02:00
diff --git a/lib.go b/lib.go
@@ -140,9 +140,9 @@ func (vm *VM) Instantiate(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -188,9 +188,9 @@ func (vm *VM) Execute(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 
 	gasUsed += gasForDeserialization
@@ -228,9 +228,9 @@ func (vm *VM) Query(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -271,9 +271,9 @@ func (vm *VM) Migrate(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -314,9 +314,9 @@ func (vm *VM) Sudo(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -359,9 +359,9 @@ func (vm *VM) Reply(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -402,9 +402,9 @@ func (vm *VM) IBCChannelOpen(
 		return gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return gasUsed, fmt.Errorf("gas depletion")
+		return gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -445,9 +445,9 @@ func (vm *VM) IBCChannelConnect(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -488,9 +488,9 @@ func (vm *VM) IBCChannelClose(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -531,9 +531,9 @@ func (vm *VM) IBCPacketReceive(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -575,9 +575,9 @@ func (vm *VM) IBCPacketAck(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 
@@ -619,9 +619,9 @@ func (vm *VM) IBCPacketTimeout(
 		return nil, gasUsed, err
 	}
 
-	gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())
+	gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()
 	if gasLimit < gasForDeserialization+gasUsed {
-		return nil, gasUsed, fmt.Errorf("gas depletion")
+		return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))
 	}
 	gasUsed += gasForDeserialization
 

Original file line number	Diff line number	Diff line change
`@@ -140,9 +140,9 @@ func (vm *VM) Instantiate(`
`140`	`140`	`return nil, gasUsed, err`
`141`	`141`	`}`
`142`	`142`
`143`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`143`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`144`	`144`	`if gasLimit < gasForDeserialization+gasUsed {`
`145`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`145`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`146`	`146`	`}`
`147`	`147`	`gasUsed += gasForDeserialization`
`148`	`148`
`@@ -188,9 +188,9 @@ func (vm *VM) Execute(`
`188`	`188`	`return nil, gasUsed, err`
`189`	`189`	`}`
`190`	`190`
`191`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`191`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`192`	`192`	`if gasLimit < gasForDeserialization+gasUsed {`
`193`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`193`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`194`	`194`	`}`
`195`	`195`
`196`	`196`	`gasUsed += gasForDeserialization`
`@@ -228,9 +228,9 @@ func (vm *VM) Query(`
`228`	`228`	`return nil, gasUsed, err`
`229`	`229`	`}`
`230`	`230`
`231`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`231`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`232`	`232`	`if gasLimit < gasForDeserialization+gasUsed {`
`233`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`233`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`234`	`234`	`}`
`235`	`235`	`gasUsed += gasForDeserialization`
`236`	`236`
`@@ -271,9 +271,9 @@ func (vm *VM) Migrate(`
`271`	`271`	`return nil, gasUsed, err`
`272`	`272`	`}`
`273`	`273`
`274`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`274`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`275`	`275`	`if gasLimit < gasForDeserialization+gasUsed {`
`276`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`276`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`277`	`277`	`}`
`278`	`278`	`gasUsed += gasForDeserialization`
`279`	`279`
`@@ -314,9 +314,9 @@ func (vm *VM) Sudo(`
`314`	`314`	`return nil, gasUsed, err`
`315`	`315`	`}`
`316`	`316`
`317`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`317`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`318`	`318`	`if gasLimit < gasForDeserialization+gasUsed {`
`319`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`319`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`320`	`320`	`}`
`321`	`321`	`gasUsed += gasForDeserialization`
`322`	`322`
`@@ -359,9 +359,9 @@ func (vm *VM) Reply(`
`359`	`359`	`return nil, gasUsed, err`
`360`	`360`	`}`
`361`	`361`
`362`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`362`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`363`	`363`	`if gasLimit < gasForDeserialization+gasUsed {`
`364`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`364`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`365`	`365`	`}`
`366`	`366`	`gasUsed += gasForDeserialization`
`367`	`367`
`@@ -402,9 +402,9 @@ func (vm *VM) IBCChannelOpen(`
`402`	`402`	`return gasUsed, err`
`403`	`403`	`}`
`404`	`404`
`405`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`405`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`406`	`406`	`if gasLimit < gasForDeserialization+gasUsed {`
`407`		`- return gasUsed, fmt.Errorf("gas depletion")`
	`407`	`+ return gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`408`	`408`	`}`
`409`	`409`	`gasUsed += gasForDeserialization`
`410`	`410`
`@@ -445,9 +445,9 @@ func (vm *VM) IBCChannelConnect(`
`445`	`445`	`return nil, gasUsed, err`
`446`	`446`	`}`
`447`	`447`
`448`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`448`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`449`	`449`	`if gasLimit < gasForDeserialization+gasUsed {`
`450`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`450`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`451`	`451`	`}`
`452`	`452`	`gasUsed += gasForDeserialization`
`453`	`453`
`@@ -488,9 +488,9 @@ func (vm *VM) IBCChannelClose(`
`488`	`488`	`return nil, gasUsed, err`
`489`	`489`	`}`
`490`	`490`
`491`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`491`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`492`	`492`	`if gasLimit < gasForDeserialization+gasUsed {`
`493`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`493`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`494`	`494`	`}`
`495`	`495`	`gasUsed += gasForDeserialization`
`496`	`496`
`@@ -531,9 +531,9 @@ func (vm *VM) IBCPacketReceive(`
`531`	`531`	`return nil, gasUsed, err`
`532`	`532`	`}`
`533`	`533`
`534`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`534`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`535`	`535`	`if gasLimit < gasForDeserialization+gasUsed {`
`536`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`536`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`537`	`537`	`}`
`538`	`538`	`gasUsed += gasForDeserialization`
`539`	`539`
`@@ -575,9 +575,9 @@ func (vm *VM) IBCPacketAck(`
`575`	`575`	`return nil, gasUsed, err`
`576`	`576`	`}`
`577`	`577`
`578`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`578`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`579`	`579`	`if gasLimit < gasForDeserialization+gasUsed {`
`580`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`580`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`581`	`581`	`}`
`582`	`582`	`gasUsed += gasForDeserialization`
`583`	`583`
`@@ -619,9 +619,9 @@ func (vm *VM) IBCPacketTimeout(`
`619`	`619`	`return nil, gasUsed, err`
`620`	`620`	`}`
`621`	`621`
`622`		`- gasForDeserialization := uint64(deserCost.Mul(uint64(len(data))).Floor())`
	`622`	`+ gasForDeserialization := deserCost.Mul(uint64(len(data))).Floor()`
`623`	`623`	`if gasLimit < gasForDeserialization+gasUsed {`
`624`		`- return nil, gasUsed, fmt.Errorf("gas depletion")`
	`624`	`+ return nil, gasUsed, fmt.Errorf("Insufficient gas left to deserialize contract execution result (%d bytes)", len(data))`
`625`	`625`	`}`
`626`	`626`	`gasUsed += gasForDeserialization`
`627`	`627`