updated test to cover new seal_call proof_limit

frame/contracts/fixtures/call_with_limit.wat

@@ -1,8 +1,8 @@
-;; This expects [account_id, gas_limit] as input and calls the account_id with the supplied gas_limit.
+;; This expects [account_id, ref_time, proof_size] as input and calls the account_id with the supplied 2D Weight limit.
 ;; It returns the result of the call as output data.
 (module
 	(import "seal0" "seal_input" (func $seal_input (param i32 i32)))
-	(import "seal0" "seal_call" (func $seal_call (param i32 i32 i64 i32 i32 i32 i32 i32 i32) (result i32)))
+	(import "seal2" "call" (func $seal_call (param i32 i32 i64 i64 i32 i32 i32 i32 i32) (result i32)))
 	(import "seal0" "seal_return" (func $seal_return (param i32 i32 i32)))
 	(import "env" "memory" (memory 1 1))
 
@@ -13,24 +13,24 @@
 	(func (export "deploy"))
 
 	(func (export "call")
-		;; Receive the encoded call + gas_limit
+		;; Receive the encoded account_id, ref_time, proof_size
 		(call $seal_input
 			(i32.const 4)	;; Pointer to the input buffer
-			(i32.const 0)	;; Size of the length buffer
+			(i32.const 0)	;; Pointer to the length of the input buffer
 		)
 		(i32.store
 			(i32.const 0)
 			(call $seal_call
+				(i32.const 8) ;; set ALLOW_REENTRY
 				(i32.const 4) ;; Pointer to "callee" address.
-				(i32.const 32) ;; Length of "callee" address.
-				(i64.load (i32.const 36)) ;; How much gas to devote for the execution.
+				(i64.load (i32.const 36)) ;; How much ref_time to devote for the execution.
+				(i64.load (i32.const 44)) ;; How much proof_size to devote for the execution.
 				(i32.const 0) ;; Pointer to the buffer with value to transfer
-				(i32.const 0) ;; Length of the buffer with value to transfer.
 				(i32.const 0) ;; Pointer to input data buffer address
-				(i32.const 0) ;; Length of input data buffer
+				(i32.const 0)  ;; Length of input data buffer
 				(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
-				(i32.const 0) ;; Ptr to output buffer len
-			)
+				(i32.const 0) ;; Length is ignored in this case
+				)
 		)
 		(call $seal_return (i32.const 0) (i32.const 0) (i32.const 4))
 	)

frame/contracts/src/tests.rs

@@ -2696,7 +2696,6 @@ fn gas_estimation_nested_call_fixed_limit() {
 	ExtBuilder::default().existential_deposit(50).build().execute_with(|| {
 		let min_balance = <Test as Config>::Currency::minimum_balance();
 		let _ = Balances::deposit_creating(&ALICE, 1000 * min_balance);
-		let _ = Balances::deposit_creating(&CHARLIE, 1000 * min_balance);
 
 		let addr_caller = Contracts::bare_instantiate(
 			ALICE,
@@ -2730,6 +2729,7 @@ fn gas_estimation_nested_call_fixed_limit() {
 			.iter()
 			.cloned()
 			.chain((GAS_LIMIT / 5).ref_time().to_le_bytes())
+			.chain((GAS_LIMIT / 5).proof_size().to_le_bytes())
 			.collect();
 
 		// Call in order to determine the gas that is required for this call
@@ -2746,22 +2746,36 @@ fn gas_estimation_nested_call_fixed_limit() {
 		assert_ok!(&result.result);
 
 		// We have a subcall with a fixed gas limit. This constitutes precharging.
-		assert!(result.gas_required.ref_time() > result.gas_consumed.ref_time());
+		assert!(result.gas_required.all_gt(result.gas_consumed));
 
 		// Make the same call using the estimated gas. Should succeed.
 		assert_ok!(
 			Contracts::bare_call(
 				ALICE,
-				addr_caller,
+				addr_caller.clone(),
 				0,
 				result.gas_required,
 				Some(result.storage_deposit.charge_or_zero()),
-				input,
+				input.clone(),
 				false,
 				Determinism::Deterministic,
 			)
 			.result
 		);
+
+		// Make the same call using proof_size a but less than estimated. Should fail with OutOfGas.
+		let result = Contracts::bare_call(
+			ALICE,
+			addr_caller,
+			0,
+			result.gas_required.sub_proof_size(1),
+			Some(result.storage_deposit.charge_or_zero()),
+			input,
+			false,
+			Determinism::Deterministic,
+		)
+		.result;
+		assert_err!(result, <Error<Test>>::OutOfGas);
 	});
 }