Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Alias for personal_sendTransaction #4554

Merged
merged 1 commit into from
Feb 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions rpc/src/v1/impls/personal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,9 @@ impl<D: Dispatcher + 'static> Personal for PersonalClient<D> {
})
.boxed()
}

fn sign_and_send_transaction(&self, meta: Metadata, request: TransactionRequest, password: String) -> BoxFuture<RpcH256, Error> {
warn!("Using deprecated personal_signAndSendTransaction, use personal_sendTransaction instead.");
self.send_transaction(meta, request, password)
}
}
13 changes: 11 additions & 2 deletions rpc/src/v1/tests/mocked/personal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,25 @@ fn sign_and_send_transaction_with_invalid_password() {
assert_eq!(tester.io.handle_request_sync(request.as_ref()), Some(response.into()));
}

#[test]
fn send_transaction() {
sign_and_send_test("personal_sendTransaction");
}

#[test]
fn sign_and_send_transaction() {
sign_and_send_test("personal_signAndSendTransaction");
}

fn sign_and_send_test(method: &str) {
let tester = setup();
let address = tester.accounts.new_account("password123").unwrap();

let request = r#"{
"jsonrpc": "2.0",
"method": "personal_sendTransaction",
"method": ""#.to_owned() + method + r#"",
"params": [{
"from": ""#.to_owned() + format!("0x{:?}", address).as_ref() + r#"",
"from": ""# + format!("0x{:?}", address).as_ref() + r#"",
"to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567",
"gas": "0x76c0",
"gasPrice": "0x9184e72a000",
Expand Down
5 changes: 5 additions & 0 deletions rpc/src/v1/traits/personal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,10 @@ build_rpc_trait! {
/// Sends transaction and signs it in single call. The account is not unlocked in such case.
#[rpc(meta, name = "personal_sendTransaction")]
fn send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;

/// Deprecated alias for `personal_sendTransaction`.
#[rpc(meta, name = "personal_signAndSendTransaction")]
fn sign_and_send_transaction(&self, Self::Metadata, TransactionRequest, String) -> BoxFuture<H256, Error>;

}
}