From 4307c6d1a9c993b79e42775be22c74167b33cadb Mon Sep 17 00:00:00 2001
From: Bryan Chen <xlchen1291@gmail.com>
Date: Mon, 12 Oct 2020 18:16:01 +1300
Subject: [PATCH] handle returns correctly for transactional

---
 frame/support/procedural/src/transactional.rs   | 2 +-
 frame/support/test/tests/storage_transaction.rs | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/frame/support/procedural/src/transactional.rs b/frame/support/procedural/src/transactional.rs
index fbd0c9ca0b3c4..6dedd92028e7d 100644
--- a/frame/support/procedural/src/transactional.rs
+++ b/frame/support/procedural/src/transactional.rs
@@ -29,7 +29,7 @@ pub fn transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStre
 		#vis #sig {
 			use #crate_::storage::{with_transaction, TransactionOutcome};
 			with_transaction(|| {
-				let r = #block;
+				let r = (|| { #block })();
 				if r.is_ok() {
 					TransactionOutcome::Commit(r)
 				} else {
diff --git a/frame/support/test/tests/storage_transaction.rs b/frame/support/test/tests/storage_transaction.rs
index a7e4a75c27fcb..d28ba070ee34c 100644
--- a/frame/support/test/tests/storage_transaction.rs
+++ b/frame/support/test/tests/storage_transaction.rs
@@ -180,15 +180,20 @@ fn storage_transaction_commit_then_rollback() {
 
 #[test]
 fn transactional_annotation() {
+	fn set_value(v: u32) -> DispatchResult {
+		Value::set(v);
+		Ok(())
+	}
+
 	#[transactional]
 	fn value_commits(v: u32) -> result::Result<u32, &'static str> {
-		Value::set(v);
+		set_value(v)?;
 		Ok(v)
 	}
 
 	#[transactional]
 	fn value_rollbacks(v: u32) -> result::Result<u32, &'static str> {
-		Value::set(v);
+		set_value(v)?;
 		Err("nah")
 	}