From 5172777c7dfbfb4517b4da65864b72da6ac827d9 Mon Sep 17 00:00:00 2001
From: Xiliang Chen <xlchen1291@gmail.com>
Date: Mon, 12 Oct 2020 23:00:19 +1300
Subject: [PATCH] handle returns correctly for transactional (#7301)

---
 substrate/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/substrate/frame/support/procedural/src/transactional.rs b/substrate/frame/support/procedural/src/transactional.rs
index 688d8cfa06..3c2617a17e 100644
--- a/substrate/frame/support/procedural/src/transactional.rs
+++ b/substrate/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/substrate/frame/support/test/tests/storage_transaction.rs b/substrate/frame/support/test/tests/storage_transaction.rs
index e305940ee6..be8b678c6d 100644
--- a/substrate/frame/support/test/tests/storage_transaction.rs
+++ b/substrate/frame/support/test/tests/storage_transaction.rs
@@ -182,15 +182,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")
 	}