From 47911b8a028afaf2bc57de0109c6756d78113dbb Mon Sep 17 00:00:00 2001
From: emostov <32168567+emostov@users.noreply.github.com>
Date: Mon, 14 Dec 2020 11:46:31 -0800
Subject: [PATCH] Have create_signed() Pass era enum

---
 src/extrinsic/mod.rs | 8 +-------
 src/lib.rs           | 7 ++++---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/extrinsic/mod.rs b/src/extrinsic/mod.rs
index 5a0365a2b4..abb39f829d 100644
--- a/src/extrinsic/mod.rs
+++ b/src/extrinsic/mod.rs
@@ -65,7 +65,7 @@ pub async fn create_signed<T>(
     nonce: T::Index,
     call: Encoded,
     signer: &(dyn Signer<T> + Send + Sync),
-    era_opts: Option<(u64, u64, T::Hash)>,
+    era_info: (Era, T::Hash),
 ) -> Result<UncheckedExtrinsic<T>, Error>
 where
     T: Runtime,
@@ -74,12 +74,6 @@ where
 {
     let spec_version = runtime_version.spec_version;
     let tx_version = runtime_version.transaction_version;
-    let era_info = match era_opts {
-        Some((period, cur_num, cur_hash)) => {
-            (Era::mortal(period, cur_num), cur_hash)
-        },
-        None => (Era::Immortal, genesis_hash)
-    };
     let extra = T::Extra::new(spec_version, tx_version, nonce, genesis_hash, era_info);
     let payload = SignedPayload::<T>::new(call, extra.extra())?;
     let signed = signer.sign(payload).await?;
diff --git a/src/lib.rs b/src/lib.rs
index 8067288512..c7b384246a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -65,7 +65,8 @@ pub use sp_version::RuntimeVersion;
 use std::marker::PhantomData;
 use sp_runtime::{
     traits::{Block, Header},
-    SaturatedConversion
+    SaturatedConversion,
+    generic::Era
 };
 
 mod error;
@@ -481,9 +482,9 @@ impl<T: Runtime> Client<T> {
             let current_number = (*current_block.header().number()).saturated_into::<u64>();
             let current_hash = current_block.hash();
 
-            Some((era_period, current_number, current_hash))
+            (Era::mortal(era_period, current_number), current_hash)
         } else {
-            None
+            (Era::Immortal, self.genesis_hash)
         };
         let signed = extrinsic::create_signed(
             &self.runtime_version,