Diff
checker
文本
文本
图像
文档
Excel
文件夹
Legal
Enterprise
桌面版
定价
登录
下载 Diffchecker 桌面版
比较文本
查找两个文本文件之间的差异
工具
历史
实时编辑器
折叠未更改行
关闭换行
视图
拆分
统一
比对精度
智能
单词
字符
语法高亮
选择语法
忽略
文本转换
转到第一个差异
编辑输入
Diffchecker Desktop
运行Diffchecker最安全的方式。获取Diffchecker桌面应用:您的差异永远不会离开您的电脑!
获取桌面版
Untitled diff
创建于
7年前
差异永不过期
清除
导出
分享
解释
82 删除
行
总计
删除
字符
总计
删除
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
118 行
全部复制
33 添加
行
总计
添加
字符
总计
添加
要继续使用此功能,请升级到
Diff
checker
Pro
查看价格
60 行
全部复制
pub enum WalletCommand {
pub enum WalletCommand {
Open(Config, // config
Open(Config, // config
Credentials, // credentials
Credentials, // credentials
Box<dyn Fn(IndyResult<WalletHandle>) + Send>),
Box<dyn Fn(IndyResult<WalletHandle>) + Send>),
复制
已复制
复制
已复制
OpenContinue(WalletHandle,
DeriveKeyResult<(MasterKey, Option<MasterKey>)>, // derive_key_result
),
DeriveKey(KeyDerivationData,
Box<dyn Fn(DeriveKeyResult<MasterKey>) + Send>),
}
macro_rules! get_cb {
($self_:ident, $e:expr) => (match $self_.pending_callbacks.borrow_mut().remove(&$e) {
Some(val) => val,
None => return error!("No pending command for id: {}", $e)
});
}
}
pub struct WalletCommandExecutor {
pub struct WalletCommandExecutor {
wallet_service: Rc<WalletService>,
wallet_service: Rc<WalletService>,
crypto_service: Rc<CryptoService>,
crypto_service: Rc<CryptoService>,
复制
已复制
复制
已复制
open_callbacks: RefCell<HashMap<WalletHandle, Box<dyn Fn(IndyResult<WalletHandle>) + Send>>>,
pending_callbacks: RefCell<HashMap<CallbackHandle, Box<dyn Fn(IndyResult<()>) + Send>>>
}
}
impl WalletCommandExecutor {
impl WalletCommandExecutor {
pub fn new(wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>) -> WalletCommandExecutor {
pub fn new(wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>) -> WalletCommandExecutor {
WalletCommandExecutor {
WalletCommandExecutor {
wallet_service,
wallet_service,
crypto_service,
crypto_service,
复制
已复制
复制
已复制
open_callbacks: RefCell::new(HashMap::new()),
pending_callbacks: RefCell::new(HashMap::new())
}
}
}
}
复制
已复制
复制
已复制
pub
fn execute(&self, command: WalletCommand) {
pub
async
fn execute(&self, command: WalletCommand) {
match command {
match command {
WalletCommand::Open(config, credentials, cb) => {
WalletCommand::Open(config, credentials, cb) => {
debug!(target: "wallet_command_executor", "Open command received");
debug!(target: "wallet_command_executor", "Open command received");
复制
已复制
复制
已复制
self._open(&config, &credentials
, cb);
cb(
self._open(&config, &credentials
).await);
}
WalletCommand::OpenContinue(wallet_handle, key_result) => {
debug!(target: "wallet_command_executor", "OpenContinue command received");
self._open_continue(wallet_handle, key_result)
}
WalletCommand::DeriveKey(key_data, cb) => {
debug!(target: "wallet_command_executor", "DeriveKey command received");
self._derive_key(key_data, cb);
}
}
};
};
}
}
复制
已复制
复制
已复制
fn _open
(&
self,
async
fn _open
<'a>(&'a
self,
config: &
Config,
config: &
'a
Config,
credentials: &
Credentials
,
credentials: &
'a
Credentials
) ->
IndyResult<WalletHandle>
{
cb: Box<dyn Fn(
IndyResult<WalletHandle>
) + Send>)
{
trace!("_open >>> config: {:?}, credentials: {:?}", config, secret!(credentials));
trace!("_open >>> config: {:?}, credentials: {:?}", config, secret!(credentials));
复制
已复制
复制
已复制
let (wallet_handle, key_derivation_data, rekey_data) =
try_cb!(
self.wallet_service.open_wallet_prepare(config, credentials)
, cb)
;
let (wallet_handle, key_derivation_data, rekey_data) =
self.wallet_service.open_wallet_prepare(config, credentials)
?
;
复制
已复制
复制
已复制
self.
open_callbacks.borrow_mut().insert(wallet_handle, cb)
;
let key =
self.
_derive_key(key_derivation_data).await?
;
复制
已复制
复制
已复制
CommandExecutor::instance().send(
let rekey = if let Some(rekey_data) = rekey_data {
Command::Wallet(WalletCommand::DeriveKey(
Some(self._derive_key(rekey_data).await?)
key_derivation_data,
} else {
Box::new(move |key_result| {
None
match (key_result, rekey_data.clone()) {
};
(Ok(key_result), Some(rekey_data)) => {
WalletCommandExecutor::_derive_rekey_and_continue(wallet_handle, key_result, rekey_data)
}
(key_result, _) => {
let key_result = key_result.map(|kr| (kr, None));
WalletCommandExecutor::_send_open_continue(wallet_handle, key_result)
}
}
}),
))
).unwrap();
复制
已复制
复制
已复制
let res =
wallet_handle
;
let res =
self.wallet_service.open_wallet_continue(
wallet_handle
, (&key, rekey.as_ref()))
;
trace!("_open <<< res: {:?}", res);
trace!("_open <<< res: {:?}", res);
复制
已复制
复制
已复制
}
fn _derive_rekey_and_continue(wallet_handle: WalletHandle, key_result: MasterKey, rekey_data: KeyDerivationData) {
CommandExecutor::instance().send(
Command::Wallet(WalletCommand::DeriveKey(
rekey_data,
Box::new(move |rekey_result| {
let key_result = key_result.clone();
let key_result = rekey_result.map(move |rekey_result| (key_result, Some(rekey_result)));
WalletCommandExecutor::_send_open_continue(wallet_handle, key_result)
}),
))
).unwrap();
}
fn _send_open_continue(wallet_handle: WalletHandle, key_result: DeriveKeyResult<(MasterKey, Option<MasterKey>)>) {
CommandExecutor::instance().send(
Command::Wallet(WalletCommand::OpenContinue(
wallet_handle,
key_result,
))
).unwrap();
}
复制
已复制
复制
已复制
fn _open_continue(&self,
res
wallet_handle: WalletHandle,
key_result: DeriveKeyResult<(MasterKey, Option<MasterKey>)>) {
let cb = self.open_callbacks.borrow_mut().remove(&wallet_handle).unwrap();
cb(key_result
.and_then(|(key, rekey)| self.wallet_service.open_wallet_continue(wallet_handle, (&key, rekey.as_ref()))))
}
}
复制
已复制
复制
已复制
fn _derive_key(&self, key_data: KeyDerivationData
, cb: Box<dyn Fn(DeriveKeyResult
<MasterKey>
) + Send>)
{
async
fn _derive_key(&self, key_data: KeyDerivationData
) -> IndyResult
<MasterKey>
{
::commands::THREADPOOL.lock().unwrap().execute(move ||
cb(
key_data.calc_master_key()
));
let (s, r) = futures::channel::oneshot::channel();
crate
::commands::THREADPOOL.lock().unwrap().execute(move ||
{
let res =
key_data.calc_master_key()
;
s.send(res).unwrap();
});
r.await.unwrap()
}
}
}
}
复制
已复制
复制
已复制
已保存差异
原始文本
打开文件
pub enum WalletCommand { Open(Config, // config Credentials, // credentials Box<dyn Fn(IndyResult<WalletHandle>) + Send>), OpenContinue(WalletHandle, DeriveKeyResult<(MasterKey, Option<MasterKey>)>, // derive_key_result ), DeriveKey(KeyDerivationData, Box<dyn Fn(DeriveKeyResult<MasterKey>) + Send>), } macro_rules! get_cb { ($self_:ident, $e:expr) => (match $self_.pending_callbacks.borrow_mut().remove(&$e) { Some(val) => val, None => return error!("No pending command for id: {}", $e) }); } pub struct WalletCommandExecutor { wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>, open_callbacks: RefCell<HashMap<WalletHandle, Box<dyn Fn(IndyResult<WalletHandle>) + Send>>>, pending_callbacks: RefCell<HashMap<CallbackHandle, Box<dyn Fn(IndyResult<()>) + Send>>> } impl WalletCommandExecutor { pub fn new(wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>) -> WalletCommandExecutor { WalletCommandExecutor { wallet_service, crypto_service, open_callbacks: RefCell::new(HashMap::new()), pending_callbacks: RefCell::new(HashMap::new()) } } pub fn execute(&self, command: WalletCommand) { match command { WalletCommand::Open(config, credentials, cb) => { debug!(target: "wallet_command_executor", "Open command received"); self._open(&config, &credentials, cb); } WalletCommand::OpenContinue(wallet_handle, key_result) => { debug!(target: "wallet_command_executor", "OpenContinue command received"); self._open_continue(wallet_handle, key_result) } WalletCommand::DeriveKey(key_data, cb) => { debug!(target: "wallet_command_executor", "DeriveKey command received"); self._derive_key(key_data, cb); } }; } fn _open(&self, config: &Config, credentials: &Credentials, cb: Box<dyn Fn(IndyResult<WalletHandle>) + Send>) { trace!("_open >>> config: {:?}, credentials: {:?}", config, secret!(credentials)); let (wallet_handle, key_derivation_data, rekey_data) = try_cb!(self.wallet_service.open_wallet_prepare(config, credentials), cb); self.open_callbacks.borrow_mut().insert(wallet_handle, cb); CommandExecutor::instance().send( Command::Wallet(WalletCommand::DeriveKey( key_derivation_data, Box::new(move |key_result| { match (key_result, rekey_data.clone()) { (Ok(key_result), Some(rekey_data)) => { WalletCommandExecutor::_derive_rekey_and_continue(wallet_handle, key_result, rekey_data) } (key_result, _) => { let key_result = key_result.map(|kr| (kr, None)); WalletCommandExecutor::_send_open_continue(wallet_handle, key_result) } } }), )) ).unwrap(); let res = wallet_handle; trace!("_open <<< res: {:?}", res); } fn _derive_rekey_and_continue(wallet_handle: WalletHandle, key_result: MasterKey, rekey_data: KeyDerivationData) { CommandExecutor::instance().send( Command::Wallet(WalletCommand::DeriveKey( rekey_data, Box::new(move |rekey_result| { let key_result = key_result.clone(); let key_result = rekey_result.map(move |rekey_result| (key_result, Some(rekey_result))); WalletCommandExecutor::_send_open_continue(wallet_handle, key_result) }), )) ).unwrap(); } fn _send_open_continue(wallet_handle: WalletHandle, key_result: DeriveKeyResult<(MasterKey, Option<MasterKey>)>) { CommandExecutor::instance().send( Command::Wallet(WalletCommand::OpenContinue( wallet_handle, key_result, )) ).unwrap(); } fn _open_continue(&self, wallet_handle: WalletHandle, key_result: DeriveKeyResult<(MasterKey, Option<MasterKey>)>) { let cb = self.open_callbacks.borrow_mut().remove(&wallet_handle).unwrap(); cb(key_result .and_then(|(key, rekey)| self.wallet_service.open_wallet_continue(wallet_handle, (&key, rekey.as_ref())))) } fn _derive_key(&self, key_data: KeyDerivationData, cb: Box<dyn Fn(DeriveKeyResult<MasterKey>) + Send>){ ::commands::THREADPOOL.lock().unwrap().execute(move || cb(key_data.calc_master_key())); } }
更改后文本
打开文件
pub enum WalletCommand { Open(Config, // config Credentials, // credentials Box<dyn Fn(IndyResult<WalletHandle>) + Send>), } pub struct WalletCommandExecutor { wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>, } impl WalletCommandExecutor { pub fn new(wallet_service: Rc<WalletService>, crypto_service: Rc<CryptoService>) -> WalletCommandExecutor { WalletCommandExecutor { wallet_service, crypto_service, } } pub async fn execute(&self, command: WalletCommand) { match command { WalletCommand::Open(config, credentials, cb) => { debug!(target: "wallet_command_executor", "Open command received"); cb(self._open(&config, &credentials).await); } }; } async fn _open<'a>(&'a self, config: &'a Config, credentials: &'a Credentials) -> IndyResult<WalletHandle> { trace!("_open >>> config: {:?}, credentials: {:?}", config, secret!(credentials)); let (wallet_handle, key_derivation_data, rekey_data) = self.wallet_service.open_wallet_prepare(config, credentials)?; let key = self._derive_key(key_derivation_data).await?; let rekey = if let Some(rekey_data) = rekey_data { Some(self._derive_key(rekey_data).await?) } else { None }; let res = self.wallet_service.open_wallet_continue(wallet_handle, (&key, rekey.as_ref())); trace!("_open <<< res: {:?}", res); res } async fn _derive_key(&self, key_data: KeyDerivationData) -> IndyResult<MasterKey> { let (s, r) = futures::channel::oneshot::channel(); crate::commands::THREADPOOL.lock().unwrap().execute(move || { let res = key_data.calc_master_key(); s.send(res).unwrap(); }); r.await.unwrap() } }
查找差异