Minor fixes and indentation in wat files

frame/contracts/fixtures/account_entrance_count_call.wat

@@ -19,16 +19,16 @@
 	(func (export "call")
 		(local $account_entrance_count i32)
 
-	    ;; Reading "callee" contract address (which is the address of the caller)
-	    (call $seal_input (i32.const 0) (i32.const 32))
+		;; Reading "callee" contract address (which is the address of the caller)
+		(call $seal_input (i32.const 0) (i32.const 32))
 
 		(set_local $account_entrance_count
 			(call $seal_account_entrance_count (i32.const 0))
 		)
 
 		;; assert account_entrance_count == 1
 		(call $assert
-		   	(i32.eq (get_local $account_entrance_count) (i32.const 1))
+			(i32.eq (get_local $account_entrance_count) (i32.const 1))
 		)
 	)
 

frame/contracts/fixtures/reentrant_count_call.wat

@@ -18,46 +18,46 @@
 		)
 	)
 	(func (export "call")
-	    (local $exit_code i32)
+	(local $exit_code i32)
 		(local $reentrant_count i32)
 
 		(set_local $reentrant_count
 			(call $seal_reentrant_count)
 		)
 
 		(get_local $reentrant_count)
-        (if
-            (then
-		        ;; assert reentrant_count == 1
-		        (call $assert
-		        	(i32.eq (get_local $reentrant_count) (i32.const 1))
-		        )
-            )
-            (else
-		        ;; Reading "callee" contract address (which is the address of the caller)
-		        (call $seal_input (i32.const 0) (i32.const 32))
+		(if
+			(then
+				;; assert reentrant_count == 1
+				(call $assert
+					(i32.eq (get_local $reentrant_count) (i32.const 1))
+				)
+			)
+			(else
+				;; Reading "callee" contract address (which is the address of the caller)
+				(call $seal_input (i32.const 0) (i32.const 32))
 
-                ;; Call to itself
-		        (set_local $exit_code
-		        	(call $seal_call
-		        		(i32.const 0)	;; Pointer to "callee" address.
-		        		(i32.const 32)	;; Length of "callee" address.
-		        		(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
-		        		(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 32)	;; Length of input data buffer
-		                (i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
-		                (i32.const 0) ;; Ptr to output buffer len
-		        	)
-		        )
+				;; Call to itself
+				(set_local $exit_code
+					(call $seal_call
+						(i32.const 0)	;; Pointer to "callee" address.
+						(i32.const 32)	;; Length of "callee" address.
+						(i64.const 0)	;; How much gas to devote for the execution. 0 = all.
+						(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 32)	;; Length of input data buffer
+						(i32.const 0xffffffff) ;; u32 max sentinel value: do not copy output
+						(i32.const 0) ;; Ptr to output buffer len
+					)
+				)
 
-		        ;; assert reentrant_count == 0
-		        (call $assert
-		        	(i32.eq (get_local $reentrant_count) (i32.const 0))
-		        )
-            )
-        )
+				;; assert reentrant_count == 0
+				(call $assert
+					(i32.eq (get_local $reentrant_count) (i32.const 0))
+				)
+			)
+		)
 	)
 
 	(func (export "deploy"))

frame/contracts/src/benchmarking/mod.rs

@@ -2098,7 +2098,7 @@ benchmarks! {
 				},
 			],
 			call_body: Some(body::repeated_dyn(r * API_BENCHMARK_BATCH_SIZE, vec![
-				Counter(0 as u32, account_id_len as u32), // account_ptr
+				Counter(0, account_id_len as u32), // account_ptr
 				Regular(Instruction::Call(0)),
 				Regular(Instruction::Drop),
 			])),

frame/contracts/src/exec.rs

@@ -243,7 +243,7 @@ pub trait Ext: sealing::Sealed {
 	/// Sets new code hash for existing contract.
 	fn set_code_hash(&mut self, hash: CodeHash<Self::T>) -> Result<(), DispatchError>;
 
-	/// Returns then number of times currently executing contract exists on the call stack in
+	/// Returns the number of times the currently executing contract exists on the call stack in
 	/// addition to the calling instance. A value of 0 means no reentrancy.
 	fn reentrant_count(&self) -> u32;
 
@@ -1239,14 +1239,12 @@ where
 
 	fn reentrant_count(&self) -> u32 {
 		let id: &AccountIdOf<Self::T> = &self.top_frame().account_id;
-		self.account_entrance_count(id).checked_sub(1).unwrap_or(0)
+		self.account_entrance_count(id).saturating_sub(1)
 	}
 
 	fn account_entrance_count(&self, account_id: &AccountIdOf<Self::T>) -> u32 {
 		self.frames()
-			.filter_map(|f| {
-				(f.delegate_caller.is_none() && &f.account_id == account_id).then(|| true)
-			})
+			.filter(|f| f.delegate_caller.is_none() && &f.account_id == account_id)
 			.count() as u32
 	}
 }

frame/contracts/src/wasm/runtime.rs

@@ -2087,15 +2087,15 @@ define_env!(Env, <E: Ext>,
 		}
 	},
 
-	// Returns then number of times currently executing contract exists on the call stack in addition
+	// Returns the number of times the currently executing contract exists on the call stack in addition
 	// to the calling instance.
 	//
 	// # Return Value
 	//
-	// Returns 0 when there is no reentrancy
+	// Returns 0 when there is no reentrancy.
 	[__unstable__] seal_reentrant_count(ctx) -> u32 => {
 		ctx.charge_gas(RuntimeCosts::ReentrantCount)?;
-		Ok(ctx.ext.reentrant_count() as u32)
+		Ok(ctx.ext.reentrant_count())
 	},
 
 	// Returns the number of times specified contract exists on the call stack. Delegated calls are
@@ -2111,6 +2111,6 @@ define_env!(Env, <E: Ext>,
 	[__unstable__] seal_account_entrance_count(ctx, account_ptr: u32) -> u32 => {
 		ctx.charge_gas(RuntimeCosts::AccountEntranceCount)?;
 		let account_id: <<E as Ext>::T as frame_system::Config>::AccountId = ctx.read_sandbox_memory_as(account_ptr)?;
-		Ok(ctx.ext.account_entrance_count(&account_id) as u32)
+		Ok(ctx.ext.account_entrance_count(&account_id))
 	},
 );