github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed dependencies to work with new architecture

Browse Source
This commit is contained in:
rachel-rose
2021-05-11 16:23:15 +02:00
parent 4368c4837f
commit e19596d388
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/jsonserver.rs
View File

@@ -1,4 +1,3 @@
#[macro_use] extern crate clap;
use async_executor::Executor;
use async_native_tls::TlsAcceptor;
use async_std::sync::Mutex;
@@ -7,7 +6,6 @@ use ff::Field;
use http_types::{Request, Response, StatusCode};
use log::*;
use rand::rngs::OsRng;
use sapvi::serial;
use serde_json::json;
use smol::Async;
use std::fs::File;
@@ -17,18 +15,18 @@ use std::net::SocketAddr;
use std::net::TcpListener;
use std::sync::Arc;
use rusqlite::Connection;
use crate::{net, serial, Result, Error};
use sapvi::{net, Result, Error};
// json RPC server goes here
struct RpcInterface {
pub struct RpcInterface {
p2p: Arc<net::P2p>,
started: Mutex<bool>,
pub started: Mutex<bool>,
stop_send: async_channel::Sender<()>,
stop_recv: async_channel::Receiver<()>,
}
impl RpcInterface {
fn new(p2p: Arc<net::P2p>) -> Arc<Self> {
pub fn new(p2p: Arc<net::P2p>) -> Arc<Self> {
let (stop_send, stop_recv) = async_channel::unbounded::<()>();
Arc::new(Self {
@@ -65,7 +63,7 @@ impl RpcInterface {
}
// add new methods to handle wallet commands
async fn serve(self: Arc<Self>, mut req: Request) -> http_types::Result<Response> {
pub async fn serve(self: Arc<Self>, mut req: Request) -> http_types::Result<Response> {
info!("RPC serving {}", req.url());
let request = req.body_string().await?;
@@ -103,7 +101,7 @@ impl RpcInterface {
let response = io
.handle_request_sync(&request)
.ok_or(sapvi::Error::BadOperationType)?;
.ok_or(Error::BadOperationType)?;
let mut res = Response::new(StatusCode::Ok);
res.insert_header("Content-Type", "text/plain");
@@ -111,7 +109,7 @@ impl RpcInterface {
Ok(res)
}
async fn wait_for_quit(self: Arc<Self>) -> Result<()> {
pub async fn wait_for_quit(self: Arc<Self>) -> Result<()> {
Ok(self.stop_recv.recv().await?)
}
}