|
@@ -266,7 +266,7 @@ impl ExtendedRestClient {
|
|
|
"timeInForce": time_in_force,
|
|
"timeInForce": time_in_force,
|
|
|
"expiryEpochMillis": expiry_epoch_millis,
|
|
"expiryEpochMillis": expiry_epoch_millis,
|
|
|
"fee": total_fee_rate.to_string(),
|
|
"fee": total_fee_rate.to_string(),
|
|
|
- "nonce": nonce_u32,
|
|
|
|
|
|
|
+ "nonce": nonce,
|
|
|
"postOnly": false,
|
|
"postOnly": false,
|
|
|
"reduceOnly": false,
|
|
"reduceOnly": false,
|
|
|
"settlement": settlement,
|
|
"settlement": settlement,
|
|
@@ -399,16 +399,8 @@ impl ExtendedRestClient {
|
|
|
|
|
|
|
|
match json_value {
|
|
match json_value {
|
|
|
Ok(data) => {
|
|
Ok(data) => {
|
|
|
- let message;
|
|
|
|
|
-
|
|
|
|
|
- if !data["message"].is_null() {
|
|
|
|
|
- message = format!("{}:{}", data["tag"].as_str().unwrap(), data["message"].as_str().unwrap());
|
|
|
|
|
- } else {
|
|
|
|
|
- message = data["tag"].to_string();
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- let mut error = Response::error(self.tag.clone(), message);
|
|
|
|
|
- error.message = format!("请求地址:{}, 请求参数:{}, 报错内容:{}。", base_url, params, error.message);
|
|
|
|
|
|
|
+ let mut error = Response::error(self.tag.clone(), "请求出错".to_string());
|
|
|
|
|
+ error.data = data;
|
|
|
error
|
|
error
|
|
|
}
|
|
}
|
|
|
Err(e) => {
|
|
Err(e) => {
|