github-jwinterm/grin-wallet
1
0
Fork 0
mirror of https://github.com/jwinterm/grin-wallet.git synced 2026-10-17 15:21:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

grin-wallet master now building against grin master (#402)

Browse Source
This commit is contained in:
Antioch Peverell
2020-05-11 10:27:47 +01:00
committed by GitHub
parent dceeda93be
commit 19da1e4aec
10 changed files with 75 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
impls/src/test_framework/testclient.rs
+5 -5
View File
@@ -32,7 +32,7 @@ use crate::util;
use crate::util::secp::key::SecretKey;
use crate::util::secp::pedersen;
use crate::util::secp::pedersen::Commitment;
use crate::util::{Mutex, RwLock};
use crate::util::{Mutex, RwLock, ToHex};
use failure::ResultExt;
use serde_json;
use std::collections::HashMap;
@@ -253,7 +253,7 @@ where
m: WalletProxyMessage,
) -> Result<WalletProxyMessage, libwallet::Error> {
let height = self.chain.head().unwrap().height;
let hash = util::to_hex(self.chain.head().unwrap().last_block_h.to_vec());
let hash = self.chain.head().unwrap().last_block_h.to_hex();
Ok(WalletProxyMessage {
sender_id: "node".to_owned(),
@@ -489,7 +489,7 @@ impl NodeClient for LocalWalletClient {
) -> Result<HashMap<pedersen::Commitment, (String, u64, u64)>, libwallet::Error> {
let query_params: Vec<String> = wallet_outputs
.iter()
.map(|commit| util::to_hex(commit.as_ref().to_vec()))
.map(|commit| commit.as_ref().to_hex())
.collect();
let query_str = query_params.join(",");
let m = WalletProxyMessage {
@@ -511,7 +511,7 @@ impl NodeClient for LocalWalletClient {
for out in outputs {
api_outputs.insert(
out.commit.commit(),
(util::to_hex(out.commit.to_vec()), out.height, out.mmr_index),
(out.commit.to_hex(), out.height, out.mmr_index),
);
}
Ok(api_outputs)
@@ -523,7 +523,7 @@ impl NodeClient for LocalWalletClient {
min_height: Option<u64>,
max_height: Option<u64>,
) -> Result<Option<(TxKernel, u64, u64)>, libwallet::Error> {
let mut query = format!("{},", util::to_hex(excess.0.to_vec()));
let mut query = format!("{},", excess.0.as_ref().to_hex());
if let Some(h) = min_height {
query += &format!("{},", h);
} else {