Merge pull request #9 from casoc/master

update event and response attribute
Kucoin · Apr 22, 2019 · 0b461ae · 0b461ae
2 parents 26bb4af + a0dd867
commit 0b461ae
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.kucoin</groupId>
     <artifactId>kucoin-java-sdk</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
 
     <name>kucoin-java-sdk</name>
     <url>http://www.kucoin.com</url>

diff --git a/src/main/java/com/kucoin/sdk/rest/response/MarketTickerResponse.java b/src/main/java/com/kucoin/sdk/rest/response/MarketTickerResponse.java
@@ -28,4 +28,6 @@ public class MarketTickerResponse {
 
     private BigDecimal last;
 
+    private BigDecimal volValue;
+
 }
diff --git a/src/main/java/com/kucoin/sdk/websocket/event/AccountChangeEvent.java b/src/main/java/com/kucoin/sdk/websocket/event/AccountChangeEvent.java
@@ -31,4 +31,6 @@ public class AccountChangeEvent {
 
     private String time;
 
+    private String accountId;
+
 }
diff --git a/src/main/java/com/kucoin/sdk/websocket/event/Level3ChangeEvent.java b/src/main/java/com/kucoin/sdk/websocket/event/Level3ChangeEvent.java
@@ -3,10 +3,10 @@
  */
 package com.kucoin.sdk.websocket.event;
 
-import java.math.BigDecimal;
-
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Created by chenshiwei on 2019/1/19.
  */
@@ -25,6 +25,8 @@ public class Level3ChangeEvent {
 
     private String orderId;
 
+    private String clientOid;
+
     private BigDecimal price;
 
     private long time;

diff --git a/src/main/java/com/kucoin/sdk/websocket/event/MatchExcutionChangeEvent.java b/src/main/java/com/kucoin/sdk/websocket/event/MatchExcutionChangeEvent.java
@@ -29,7 +29,7 @@ public class MatchExcutionChangeEvent {
 
     private String type;
 
-    private String markerOrderId;
+    private String makerOrderId;
 
     private String tradeId;
 

diff --git a/src/main/java/com/kucoin/sdk/websocket/event/OrderActivateEvent.java b/src/main/java/com/kucoin/sdk/websocket/event/OrderActivateEvent.java
@@ -49,4 +49,6 @@ public class OrderActivateEvent {
 
     private String stopType;
 
+    private String clientOid;
+
 }
diff --git a/src/test/java/com/kucoin/sdk/KucoinPrivateWSClientTest.java b/src/test/java/com/kucoin/sdk/KucoinPrivateWSClientTest.java
@@ -12,7 +12,6 @@
 import org.hamcrest.core.Is;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -55,7 +54,6 @@ public static void afterClass() throws Exception {
     }
 
     @Test
-    @Ignore // TODO broken
     public void onOrderActivate() throws Exception {
         AtomicReference<OrderActivateEvent> event = new AtomicReference<>();
         CountDownLatch gotEvent = new CountDownLatch(1);
@@ -85,7 +83,6 @@ public void onOrderActivate() throws Exception {
     }
 
     @Test
-    @Ignore // TODO broken
     public void onAccountBalance() throws Exception {
         AtomicReference<AccountChangeEvent> event = new AtomicReference<>();
         CountDownLatch gotEvent = new CountDownLatch(1);

diff --git a/src/test/java/com/kucoin/sdk/KucoinPublicWSClientTest.java b/src/test/java/com/kucoin/sdk/KucoinPublicWSClientTest.java
@@ -13,7 +13,6 @@
 import org.hamcrest.core.Is;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -51,7 +50,6 @@ public static void afterClass() throws Exception {
     }
 
     @Test
-    @Ignore
     public void onTicker() throws Exception {
         AtomicReference<TickerResponse> event = new AtomicReference<>();
         CountDownLatch gotEvent = new CountDownLatch(1);
@@ -70,7 +68,6 @@ public void onTicker() throws Exception {
     }
 
     @Test
-    @Ignore // TODO broken
     public void onLevel2Data() throws Exception {
         AtomicReference<Level2ChangeEvent> event = new AtomicReference<>();
         CountDownLatch gotEvent = new CountDownLatch(1);
@@ -89,7 +86,6 @@ public void onLevel2Data() throws Exception {
     }
 
     @Test
-    @Ignore
     public void onMatchExecutionData() throws Exception {
         AtomicReference<MatchExcutionChangeEvent> event = new AtomicReference<>();
         CountDownLatch gotEvent = new CountDownLatch(1);
@@ -108,7 +104,6 @@ public void onMatchExecutionData() throws Exception {
     }
 
     @Test
-    @Ignore // TODO broken
     public void onLevel3Data() throws Exception {
       AtomicReference<Level3ChangeEvent> event = new AtomicReference<>();
       CountDownLatch gotEvent = new CountDownLatch(1);