From 08a47ea2d48c2de543658a50d74dab39caa10b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Sat, 10 Dec 2016 20:18:42 +0100
Subject: [PATCH] Allow modifications of gas when confirming in signer (#3798)

---
 rpc/src/v1/impls/signer.rs        | 10 ++++++----
 rpc/src/v1/tests/mocked/signer.rs |  4 ++--
 rpc/src/v1/types/confirmations.rs | 12 +++++++++++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/rpc/src/v1/impls/signer.rs b/rpc/src/v1/impls/signer.rs
index 66f46ba0185..f13a3d03781 100644
--- a/rpc/src/v1/impls/signer.rs
+++ b/rpc/src/v1/impls/signer.rs
@@ -89,11 +89,13 @@ impl<C: 'static, M: 'static> Signer for SignerClient<C, M> where C: MiningBlockC
 		signer.peek(&id).map(|confirmation| {
 			let mut payload = confirmation.payload.clone();
 			// Modify payload
-			match (&mut payload, modification.gas_price) {
-				(&mut ConfirmationPayload::SendTransaction(ref mut request), Some(gas_price)) => {
+			if let ConfirmationPayload::SendTransaction(ref mut request) = payload {
+				if let Some(gas_price) = modification.gas_price {
 					request.gas_price = gas_price.into();
-				},
-				_ => {},
+				}
+				if let Some(gas) = modification.gas {
+					request.gas = gas.into();
+				}
 			}
 			// Execute
 			let result = dispatch::execute(&*client, &*miner, &*accounts, payload, Some(pass));
diff --git a/rpc/src/v1/tests/mocked/signer.rs b/rpc/src/v1/tests/mocked/signer.rs
index ea89e5876a0..c87abb7eb2e 100644
--- a/rpc/src/v1/tests/mocked/signer.rs
+++ b/rpc/src/v1/tests/mocked/signer.rs
@@ -183,7 +183,7 @@ fn should_confirm_transaction_and_dispatch() {
 	let t = Transaction {
 		nonce: U256::zero(),
 		gas_price: U256::from(0x1000),
-		gas: U256::from(10_000_000),
+		gas: U256::from(0x50505),
 		action: Action::Call(recipient),
 		value: U256::from(0x1),
 		data: vec![]
@@ -198,7 +198,7 @@ fn should_confirm_transaction_and_dispatch() {
 	let request = r#"{
 		"jsonrpc":"2.0",
 		"method":"signer_confirmRequest",
-		"params":["0x1", {"gasPrice":"0x1000"}, "test"],
+		"params":["0x1", {"gasPrice":"0x1000","gas":"0x50505"}, "test"],
 		"id":1
 	}"#;
 	let response = r#"{"jsonrpc":"2.0","result":""#.to_owned() + format!("0x{:?}", t.hash()).as_ref() + r#"","id":1}"#;
diff --git a/rpc/src/v1/types/confirmations.rs b/rpc/src/v1/types/confirmations.rs
index d8cfa14d608..f6901842270 100644
--- a/rpc/src/v1/types/confirmations.rs
+++ b/rpc/src/v1/types/confirmations.rs
@@ -142,6 +142,8 @@ pub struct TransactionModification {
 	/// Modified gas price
 	#[serde(rename="gasPrice")]
 	pub gas_price: Option<U256>,
+	/// Modified gas
+	pub gas: Option<U256>,
 }
 
 /// Represents two possible return values.
@@ -275,18 +277,26 @@ mod tests {
 		let s1 = r#"{
 			"gasPrice":"0xba43b7400"
 		}"#;
-		let s2 = r#"{}"#;
+		let s2 = r#"{"gas": "0x1233"}"#;
+		let s3 = r#"{}"#;
 
 		// when
 		let res1: TransactionModification = serde_json::from_str(s1).unwrap();
 		let res2: TransactionModification = serde_json::from_str(s2).unwrap();
+		let res3: TransactionModification = serde_json::from_str(s3).unwrap();
 
 		// then
 		assert_eq!(res1, TransactionModification {
 			gas_price: Some(U256::from_str("0ba43b7400").unwrap()),
+			gas: None,
 		});
 		assert_eq!(res2, TransactionModification {
 			gas_price: None,
+			gas: Some(U256::from_str("1233").unwrap()),
+		});
+		assert_eq!(res3, TransactionModification {
+			gas_price: None,
+			gas: None,
 		});
 	}
 }