From d0723f186662fd69ee37601367f51095d132df92 Mon Sep 17 00:00:00 2001
From: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Date: Tue, 26 Jan 2021 16:42:27 +0100
Subject: [PATCH] Ensure transactional with ? works in frame v2 (#7982)

---
 frame/support/test/tests/pallet.rs              | 8 ++++----
 frame/support/test/tests/storage_transaction.rs | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/frame/support/test/tests/pallet.rs b/frame/support/test/tests/pallet.rs
index 974b901480661..431377a70ee3e 100644
--- a/frame/support/test/tests/pallet.rs
+++ b/frame/support/test/tests/pallet.rs
@@ -155,11 +155,11 @@ pub mod pallet {
 			#[pallet::compact] foo: u32,
 		) -> DispatchResultWithPostInfo {
 			Self::deposit_event(Event::Something(0));
-			if foo != 0 {
-				Ok(().into())
-			} else {
-				Err(Error::<T>::InsufficientProposersBalance.into())
+			if foo == 0 {
+				Err(Error::<T>::InsufficientProposersBalance)?;
 			}
+
+			Ok(().into())
 		}
 	}
 
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index 0c3fa2ff3649f..ee6ce5869e176 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -195,7 +195,8 @@ fn transactional_annotation() {
 	#[transactional]
 	fn value_rollbacks(v: u32) -> result::Result<u32, &'static str> {
 		set_value(v)?;
-		Err("nah")
+		Err("nah")?;
+		Ok(v)
 	}
 
 	TestExternalities::default().execute_with(|| {