Merge remote-tracking branch 'origin/master'

This commit is contained in:
Mashy
2019-05-31 13:27:47 +10:00
15 changed files with 111 additions and 95 deletions
-14
View File
@@ -4,11 +4,7 @@ use tungstenite::Message::Binary;
use postgres::transaction::Transaction;
use std::net::{TcpStream};
// demo
use std::iter;
use std::time::Instant;
use rand::{thread_rng, Rng};
use rand::distributions::{Alphanumeric};
use serde_cbor::{from_slice, to_vec};
use uuid::Uuid;
@@ -353,11 +349,6 @@ impl Rpc {
params: RpcResult::InstanceState(vbox_apply(msg.params, tx, &account)?)
};
Rpc::send_msg(client, RpcResponse {
method: "account_constructs".to_string(),
params: RpcResult::ConstructList(account_constructs(tx, &account)?)
})?;
return Ok(response);
}
@@ -380,11 +371,6 @@ impl Rpc {
params: RpcResult::InstanceState(vbox_unequip(msg.params, tx, &account)?)
};
Rpc::send_msg(client, RpcResponse {
method: "account_constructs".to_string(),
params: RpcResult::ConstructList(account_constructs(tx, &account)?)
})?;
return Ok(response);
}
}