Merge branch 'master' of github.com:darkrenaissance/darkfi

This commit is contained in:
ghassmo
2021-09-23 13:39:50 +03:00
2 changed files with 5 additions and 3 deletions

View File

@@ -214,7 +214,7 @@ async fn start(config: &DrkConfig, options: ArgMatches<'_>) -> Result<()> {
Err(Error::MissingParams)
}
#[tokio::main]
#[async_std::main]
async fn main() -> Result<()> {
let args = clap_app!(drk =>
(@arg CONFIG: -c --config +takes_value "Sets a custom config file")

View File

@@ -1,10 +1,12 @@
use std::str;
use async_std::{
io::{ReadExt, WriteExt},
net::TcpStream,
};
use rand::Rng;
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::net::TcpStream;
use crate::Error;