rusk: eliminated surcharge

rusk/tests/services/contract_pays_earns.rs

@@ -137,7 +137,7 @@ fn make_and_execute_transaction(
         .expect("There should be one spent transactions");
 
     assert!(tx.err.is_none(), "Transaction should succeed");
-    tx.gas_spent
+    tx.economic_gas_spent
 }
 
 /// We call method 'pay' of a Charlie contract
@@ -165,8 +165,9 @@ pub async fn contract_pays() -> Result<()> {
 
     info!("Original Root: {:?}", hex::encode(original_root));
 
-    let gas_spent = make_and_execute_transaction(&rusk, &wallet, "pay");
-    assert_eq!(gas_spent, 0, "Transaction should be free");
+    let economic_gas_spent =
+        make_and_execute_transaction(&rusk, &wallet, "pay");
+    assert_eq!(economic_gas_spent, 0, "Transaction should be free");
 
     // Check the state's root is changed from the original one
     let new_root = rusk.state_root();
@@ -185,7 +186,6 @@ pub async fn contract_pays() -> Result<()> {
 #[tokio::test(flavor = "multi_thread")]
 pub async fn contract_earns() -> Result<()> {
     const CHARLIE_CHARGE: u64 = 20_000_000; // that much Charlie contract's method 'earn' is charging
-    const CHARGE_DISCOUNT: u64 = 10_000; // possible discount due to gas usage approximation
 
     logger();
 
@@ -207,10 +207,10 @@ pub async fn contract_earns() -> Result<()> {
 
     info!("Original Root: {:?}", hex::encode(original_root));
 
-    let gas_spent = make_and_execute_transaction(&rusk, &wallet, "earn");
-    assert!(
-        gas_spent >= (CHARLIE_CHARGE - CHARGE_DISCOUNT)
-            && gas_spent <= CHARLIE_CHARGE,
+    let economic_gas_spent =
+        make_and_execute_transaction(&rusk, &wallet, "earn");
+    assert_eq!(
+        economic_gas_spent, CHARLIE_CHARGE,
         "Transaction should cost as much as contract is charging minus discount"
     );