GRIN/grin-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Secure API JSON RPC ID can be integer or string (#314)

Browse Source 
* Fix #312

* Fix tests
This commit is contained in:
Quentin Le Sceller
2020-01-24 06:01:16 -05:00
committed by Yeastplume
parent f09c91f626
commit 3091bd9701
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/src/controller.rs
+2 -2
View File
@@ -475,7 +475,7 @@ impl OwnerV3Helpers {
pub fn decrypt_request(
key: Arc<Mutex<Option<SecretKey>>>,
req: &serde_json::Value,
) -> Result<(u32, serde_json::Value), serde_json::Value> {
) -> Result<(u64, serde_json::Value), serde_json::Value> {
let share_key_ref = key.lock();
let shared_key = share_key_ref.as_ref().unwrap();
let enc_req: EncryptedRequest = serde_json::from_value(req.clone()).map_err(|e| {
@@ -497,7 +497,7 @@ impl OwnerV3Helpers {
/// Encrypt a response
pub fn encrypt_response(
key: Arc<Mutex<Option<SecretKey>>>,
id: u32,
id: u64,
res: &serde_json::Value,
) -> Result<serde_json::Value, serde_json::Value> {
let share_key_ref = key.lock();