Moved minerStart() and minerStop() methods to the JsonRpc2_0Geth class

JolyHuang · Apr 3, 2018 · e4957ec · e4957ec
1 parent 6b297f8
commit e4957ec
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 52 deletions.
diff --git a/core/src/main/java/org/web3j/protocol/core/Ethereum.java b/core/src/main/java/org/web3j/protocol/core/Ethereum.java
@@ -2,7 +2,6 @@
 
 import java.math.BigInteger;
 
-import org.web3j.protocol.admin.methods.response.BooleanResponse;
 import org.web3j.protocol.core.methods.request.ShhFilter;
 import org.web3j.protocol.core.methods.response.DbGetHex;
 import org.web3j.protocol.core.methods.response.DbGetString;
@@ -39,7 +38,6 @@
 import org.web3j.protocol.core.methods.response.EthSyncing;
 import org.web3j.protocol.core.methods.response.EthTransaction;
 import org.web3j.protocol.core.methods.response.EthUninstallFilter;
-import org.web3j.protocol.core.methods.response.MinerStartResponse;
 import org.web3j.protocol.core.methods.response.NetListening;
 import org.web3j.protocol.core.methods.response.NetPeerCount;
 import org.web3j.protocol.core.methods.response.NetVersion;
@@ -200,8 +198,4 @@ Request<?, org.web3j.protocol.core.methods.response.ShhPost> shhPost(
     Request<?, ShhMessages> shhGetFilterChanges(BigInteger filterId);
 
     Request<?, ShhMessages> shhGetMessages(BigInteger filterId);
-
-    Request<?, MinerStartResponse> minerStart(int threadCount);
-
-    Request<?, BooleanResponse> minerStop();
 }
diff --git a/core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java b/core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java
@@ -9,7 +9,6 @@
 
 import org.web3j.protocol.Web3j;
 import org.web3j.protocol.Web3jService;
-import org.web3j.protocol.admin.methods.response.BooleanResponse;
 import org.web3j.protocol.core.methods.request.ShhFilter;
 import org.web3j.protocol.core.methods.request.ShhPost;
 import org.web3j.protocol.core.methods.request.Transaction;
@@ -49,7 +48,6 @@
 import org.web3j.protocol.core.methods.response.EthTransaction;
 import org.web3j.protocol.core.methods.response.EthUninstallFilter;
 import org.web3j.protocol.core.methods.response.Log;
-import org.web3j.protocol.core.methods.response.MinerStartResponse;
 import org.web3j.protocol.core.methods.response.NetListening;
 import org.web3j.protocol.core.methods.response.NetPeerCount;
 import org.web3j.protocol.core.methods.response.NetVersion;
@@ -688,24 +686,6 @@ public Request<?, ShhMessages> shhGetMessages(BigInteger filterId) {
                 ShhMessages.class);
     }
 
-    @Override
-    public Request<?, MinerStartResponse> minerStart(int threadCount) {
-        return new Request<>(
-                "miner_start",
-                Arrays.asList(threadCount),
-                web3jService,
-                MinerStartResponse.class);
-    }
-
-    @Override
-    public Request<?, BooleanResponse> minerStop() {
-        return new Request<>(
-                "miner_stop",
-                Collections.<String>emptyList(),
-                web3jService,
-                BooleanResponse.class);
-    }
-
     @Override
     public Observable<String> ethBlockHashObservable() {
         return web3jRx.ethBlockHashObservable(blockTime);

diff --git a/core/src/test/java/org/web3j/protocol/core/RequestTest.java b/core/src/test/java/org/web3j/protocol/core/RequestTest.java
@@ -7,8 +7,6 @@
 
 import org.web3j.protocol.RequestTester;
 import org.web3j.protocol.Web3j;
-import org.web3j.protocol.core.DefaultBlockParameter;
-import org.web3j.protocol.core.DefaultBlockParameterName;
 import org.web3j.protocol.core.methods.request.EthFilter;
 import org.web3j.protocol.core.methods.request.ShhFilter;
 import org.web3j.protocol.core.methods.request.ShhPost;
@@ -623,21 +621,4 @@ public void testShhGetMessages() throws Exception {
         verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"shh_getMessages\","
                 + "\"params\":[\"0x07\"],\"id\":1}");
     }
-
-    @Test
-    public void testMinerStart() throws Exception {
-        web3j.minerStart(4).send();
-
-        verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"miner_start\","
-                + "\"params\":[4],\"id\":1}");
-    }
-
-    @Test
-    public void testMinerStop() throws Exception {
-        web3j.minerStop().send();
-
-        verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"miner_stop\","
-                + "\"params\":[],\"id\":1}");
-    }
-
 }
diff --git a/geth/src/main/java/org/web3j/protocol/geth/Geth.java b/geth/src/main/java/org/web3j/protocol/geth/Geth.java
@@ -5,6 +5,7 @@
 import org.web3j.protocol.admin.methods.response.BooleanResponse;
 import org.web3j.protocol.admin.methods.response.PersonalSign;
 import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.methods.response.MinerStartResponse;
 import org.web3j.protocol.geth.response.PersonalEcRecover;
 import org.web3j.protocol.geth.response.PersonalImportRawKey;
 
@@ -16,12 +17,16 @@ static Geth build(Web3jService web3jService) {
         return new JsonRpc2_0Geth(web3jService);
     }
 
-    public Request<?, PersonalImportRawKey> personalImportRawKey(String keydata, String password);
+    Request<?, PersonalImportRawKey> personalImportRawKey(String keydata, String password);
 
-    public Request<?, BooleanResponse> personalLockAccount(String accountId);
+    Request<?, BooleanResponse> personalLockAccount(String accountId);
 
-    public Request<?, PersonalSign> personalSign(String message, String accountId, String password);
-
-    public Request<?, PersonalEcRecover> personalEcRecover(String message, String signiture);
+    Request<?, PersonalSign> personalSign(String message, String accountId, String password);
 
+    Request<?, PersonalEcRecover> personalEcRecover(String message, String signiture);
+
+    Request<?, MinerStartResponse> minerStart(int threadCount);
+
+    Request<?, BooleanResponse> minerStop();
+
 }
diff --git a/geth/src/main/java/org/web3j/protocol/geth/JsonRpc2_0Geth.java b/geth/src/main/java/org/web3j/protocol/geth/JsonRpc2_0Geth.java
@@ -1,12 +1,14 @@
 package org.web3j.protocol.geth;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 import org.web3j.protocol.Web3jService;
 import org.web3j.protocol.admin.JsonRpc2_0Admin;
 import org.web3j.protocol.admin.methods.response.BooleanResponse;
 import org.web3j.protocol.admin.methods.response.PersonalSign;
 import org.web3j.protocol.core.Request;
+import org.web3j.protocol.core.methods.response.MinerStartResponse;
 import org.web3j.protocol.geth.response.PersonalEcRecover;
 import org.web3j.protocol.geth.response.PersonalImportRawKey;
 
@@ -56,6 +58,24 @@ public Request<?, PersonalEcRecover> personalEcRecover(
                 Arrays.asList(hexMessage,signedMessage),
                 web3jService,
                 PersonalEcRecover.class);
-    } 
-
+    }
+
+    @Override
+    public Request<?, MinerStartResponse> minerStart(int threadCount) {
+        return new Request<>(
+                "miner_start",
+                Arrays.asList(threadCount),
+                web3jService,
+                MinerStartResponse.class);
+    }
+
+    @Override
+    public Request<?, BooleanResponse> minerStop() {
+        return new Request<>(
+                "miner_stop",
+                Collections.<String>emptyList(),
+                web3jService,
+                BooleanResponse.class);
+    }
+
 }
diff --git a/geth/src/test/java/org/web3j/protocol/geth/RequestTest.java b/geth/src/test/java/org/web3j/protocol/geth/RequestTest.java
@@ -52,4 +52,20 @@ public void testPersonalEcRecover() throws Exception {
         verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"personal_ecRecover\",\"params\":[\"0xdeadbeaf\",\"0xa3f20717a250c2b0b729b7e5becbff67fdaef7e0699da4de7ca5895b02a170a12d887fd3b17bfdce3481f10bea41f45ba9f709d39ce8325427b57afcfc994cee1b\"],\"id\":1}");
         //CHECKSTYLE:ON
     }
+
+    @Test
+    public void testMinerStart() throws Exception {
+        web3j.minerStart(4).send();
+
+        verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"miner_start\","
+                + "\"params\":[4],\"id\":1}");
+    }
+
+    @Test
+    public void testMinerStop() throws Exception {
+        web3j.minerStop().send();
+
+        verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"miner_stop\","
+                + "\"params\":[],\"id\":1}");
+    }
 }