Remove delegated call from test, address comments

frame/contracts/fixtures/reentrant_count_call.wat

@@ -1,7 +1,6 @@
 (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 "seal0" "seal_delegate_call" (func $seal_delegate_call (param i32 i32 i32 i32 i32 i32) (result i32)))
 	(import "__unstable__" "seal_reentrant_count" (func $seal_reentrant_count (result i32)))
 	(import "env" "memory" (memory 1 1))
 
@@ -33,23 +32,6 @@
 		        (call $assert
 		        	(i32.eq (get_local $reentrant_count) (i32.const 1))
 		        )
-
-                ;; Delegated call to itself
-		        (set_local $exit_code
-		        	(call $seal_delegate_call
-		        		(i32.const 0)	;; Set no call flags (reentrance is forbidden)
-		        		(i32.const 0)	;; Pointer to "callee" code_hash.
-		        		(i32.const 0)	;; Input is ignored
-		        		(i32.const 0)	;; Length of the input
-		        		(i32.const 0xffffffff)	;; u32 max sentinel value: do not copy output
-		        		(i32.const 0)	;; Length is ignored in this case
-		        	)
-		        )
-
-		        ;; Second reentrance is forbidden
-		        (call $assert
-		        	(i32.eq (get_local $exit_code) (i32.const 1))
-		        )
             )
             (else
 		        ;; Reading "callee" contract address (which is the address of the caller)
@@ -70,9 +52,9 @@
 		        	)
 		        )
 
-		        ;; Check for status code 1, due to reentrance in delegated call.
+		        ;; assert reentrant_count == 0
 		        (call $assert
-		        	(i32.eq (get_local $exit_code) (i32.const 1)) ;; ReturnCode::ContractTrapped
+		        	(i32.eq (get_local $reentrant_count) (i32.const 0))
 		        )
             )
         )

frame/contracts/src/exec.rs

@@ -1239,7 +1239,7 @@ where
 
 	fn reentrant_count(&self) -> u32 {
 		let id: &AccountIdOf<Self::T> = &self.top_frame().account_id;
-		self.account_entrance_count(id) - 1u32
+		self.account_entrance_count(id).checked_sub(1).unwrap_or(0)
 	}
 
 	fn account_entrance_count(&self, account_id: &AccountIdOf<Self::T>) -> u32 {

frame/contracts/src/tests.rs

@@ -3231,7 +3231,7 @@ fn set_code_hash() {
 
 #[test]
 #[cfg(feature = "unstable-interface")]
-fn reentrant_count_works() {
+fn reentrant_count_works_with_call() {
 	let (wasm1, code_hash1) = compile_module::<Test>("reentrant_count_call").unwrap();
 	let contract_addr1 = Contracts::contract_address(&ALICE, &code_hash1, &[]);
 

frame/contracts/src/wasm/mod.rs

@@ -527,7 +527,7 @@ mod tests {
 			12
 		}
 		fn account_entrance_count(&self, _account_id: &AccountIdOf<Self::T>) -> u32 {
-			unimplemented!()
+			12
 		}
 	}
 
@@ -2617,12 +2617,45 @@ mod tests {
 		)
 	)
 	(func (export "call")
-		(local $exit_code i32)
-		(set_local $exit_code
+		(local $return_val i32)
+		(set_local $return_val
 			(call $seal_reentrant_count)
 		)
 		(call $assert
-			(i32.eq (get_local $exit_code) (i32.const 12))
+			(i32.eq (get_local $return_val) (i32.const 12))
+		)
+	)
+
+	(func (export "deploy"))
+)
+"#;
+
+		let mut mock_ext = MockExt::default();
+		execute(CODE, vec![], &mut mock_ext).unwrap();
+	}
+
+	#[test]
+	#[cfg(feature = "unstable-interface")]
+	fn account_entrance_count_works() {
+		const CODE: &str = r#"
+(module
+	(import "__unstable__" "seal_account_entrance_count" (func $seal_account_entrance_count (param i32) (result i32)))
+	(import "env" "memory" (memory 1 1))
+	(func $assert (param i32)
+		(block $ok
+			(br_if $ok
+				(get_local 0)
+			)
+			(unreachable)
+		)
+	)
+	(func (export "call")
+		(local $return_val i32)
+		(set_local $return_val
+			(call $seal_account_entrance_count (i32.const 0))
+		)
+		(call $assert
+			(i32.eq (get_local $return_val) (i32.const 12))
 		)
 	)