修改random 为is_fee

Author: YouNeedWork

core/src/client/handle_stream.rs

@@ -17,7 +17,7 @@ use crate::{
         CLIENT_LOGIN, CLIENT_SUBMITWORK,
     },
     state::Worker,
-    util::{config::Settings, is_fee_random},
+    util::{config::Settings, is_fee, is_fee_random},
 };
 use crate::{
     protocol::ethjson::{
@@ -303,7 +303,7 @@ where
                     if let Ok(rpc) = serde_json::from_str::<EthServerRootObject>(buf) {
                         // 增加索引
                         worker.send_job()?;
-                        if is_fee_random(*DEVELOP_FEE) {
+                        if is_fee(worker.total_send_idx,*DEVELOP_FEE) {
                             #[cfg(debug_assertions)]
                             debug!("进入开发者抽水回合");
 
@@ -353,12 +353,11 @@ where
                                 write_rpc(is_encrypted,&mut worker_w,&job_rpc,&worker_name).await?;
                                 continue;
                             }
-                        } else if is_fee_random(config.share_rate.into()) {
+                        } else if is_fee(worker.total_send_idx,config.share_rate.into()) {
                             #[cfg(debug_assertions)]
                             debug!("进入普通抽水回合");
                             if let Some(job_res) = wait_job.pop_back() {
-                            //if let Ok(job_res) =  chan.try_recv() {
-                                
+
                                 job_rpc.result = job_res.clone();
                                 let hi = job_rpc.get_hight();
                                 if hi != 0 {

local-pool/src/main.rs

@@ -1,10 +1,12 @@
-use anyhow::Result;
+use anyhow::{anyhow, Result};
 use clap::{
     crate_description, crate_name, crate_version, App, Arg, ArgMatches,
 };
 use std::net::ToSocketAddrs;
+use tokio::{io::AsyncWriteExt, net::TcpSocket};
 
 mod encrypt;
+mod server;
 use encrypt::accept_encrypt_tcp;
 
 #[tokio::main]
@@ -36,14 +38,27 @@ async fn main() -> Result<()> {
         }
     };
 
-    let res = tokio::try_join!(accept_encrypt_tcp(port, addr));
+    let res =
+        tokio::try_join!(accept_encrypt_tcp(port, addr), server_tcp(addr));
+
     if let Err(err) = res {
         tracing::info!("加密服务断开: {}", err);
     }
 
     Ok(())
 }
 
+async fn server_tcp(addr: std::net::SocketAddr) -> Result<()> {
+    let socket = TcpSocket::new_v4()?;
+    let mut s = socket.connect(addr).await?;
+
+    s.write_all(b"Hello world").await?;
+    //发送当前钱包地址。后续的任务全部提交给一个钱包。
+    //let (read,write) = s.split();
+
+    return Err(anyhow!("非正常退出"));
+}
+
 pub async fn get_encrypt_command_matches() -> Result<ArgMatches<'static>> {
     let matches = App::new(format!(
         "{}, 版本: {}",

local-pool/src/server/mod.rs

@@ -0,0 +1,8 @@
+pub struct Server {}
+
+impl Server {
+    pub fn new() -> Self { Server {} }
+}
+
+#[test]
+fn test_server_new() { let s = Server::new(); }