more tests, more endpoints

Author: edwardstock

README.md

@@ -24,7 +24,7 @@ project build.gradle
 ```groovy
 
 ext {
-    minterBlockchainSDK = "0.4.0"
+    minterBlockchainSDK = "0.5.0"
 }
 
 dependencies {

RELEASE.md

@@ -8,7 +8,8 @@
     - Create multisig address (transaction for creating multisignature address)
     - Multisend (single transaction for sending coins to multiple addresses)
     - Edit candidate (transaction for editing existing candidate)
- - Added network "status" endpoint to repositories
+ - Added missing endpoints and repositories
+ - More tests (still without mocks. Soon...)
 
 
 ## 0.4.0

scripts

@@ -32,6 +32,7 @@
 import org.junit.Before;
 
 import network.minter.core.MinterSDK;
+import network.minter.core.internal.exceptions.NativeLoadException;
 import network.minter.core.internal.log.Mint;
 import network.minter.core.internal.log.StdLogger;
 
@@ -42,7 +43,11 @@
 public class BaseApiTest {
 
     static {
-        MinterSDK.initialize();
+        try {
+            MinterSDK.initialize();
+        } catch (NativeLoadException e) {
+            e.printStackTrace();
+        }
         //noinspection ConstantConditions
         Mint.brew(new StdLogger());
     }

src/androidTest/java/network/minter/blockchain/models/BaseApiTest.java

@@ -33,16 +33,22 @@
 import javax.annotation.Nonnull;
 
 import network.minter.blockchain.repo.BlockChainAccountRepository;
+import network.minter.blockchain.repo.BlockChainBlockRepository;
+import network.minter.blockchain.repo.BlockChainCandidateRepository;
 import network.minter.blockchain.repo.BlockChainCoinRepository;
+import network.minter.blockchain.repo.BlockChainEventRepository;
+import network.minter.blockchain.repo.BlockChainStatusRepository;
 import network.minter.blockchain.repo.BlockChainTransactionRepository;
 import network.minter.core.crypto.BytesData;
 import network.minter.core.crypto.MinterAddress;
 import network.minter.core.crypto.MinterHash;
+import network.minter.core.crypto.MinterPublicKey;
 import network.minter.core.internal.api.ApiService;
 import network.minter.core.internal.api.converters.BigIntegerDeserializer;
 import network.minter.core.internal.api.converters.BytesDataDeserializer;
 import network.minter.core.internal.api.converters.MinterAddressDeserializer;
 import network.minter.core.internal.api.converters.MinterHashDeserializer;
+import network.minter.core.internal.api.converters.MinterPublicKeyDeserializer;
 import network.minter.core.internal.log.Mint;
 import network.minter.core.internal.log.TimberLogger;
 import okhttp3.logging.HttpLoggingInterceptor;
@@ -58,6 +64,10 @@ public class MinterBlockChainApi {
     private BlockChainAccountRepository mAccountRepository;
     private BlockChainCoinRepository mCoinRepository;
     private BlockChainTransactionRepository mTransactionRepository;
+    private BlockChainBlockRepository mBlockRepository;
+    private BlockChainCandidateRepository mBlockChainCandidateRepository;
+    private BlockChainStatusRepository mStatusRepository;
+    private BlockChainEventRepository mEventRepository;
 
     private MinterBlockChainApi() {
         this(BASE_NODE_URL);
@@ -93,6 +103,10 @@ public static void initialize(boolean debug) {
         initialize(BASE_NODE_URL, debug, new TimberLogger());
     }
 
+    public static void initialize(String baseNodeApiUrl) {
+        initialize(baseNodeApiUrl, false, new TimberLogger());
+    }
+
     public static MinterBlockChainApi getInstance() {
         return INSTANCE;
     }
@@ -103,10 +117,43 @@ public GsonBuilder getGsonBuilder() {
         out.registerTypeAdapter(MinterHash.class, new MinterHashDeserializer());
         out.registerTypeAdapter(BigInteger.class, new BigIntegerDeserializer());
         out.registerTypeAdapter(BytesData.class, new BytesDataDeserializer());
+        out.registerTypeAdapter(MinterPublicKey.class, new MinterPublicKeyDeserializer());
 
         return out;
     }
 
+    public BlockChainEventRepository event() {
+        if (mEventRepository == null) {
+            mEventRepository = new BlockChainEventRepository(mApiService);
+        }
+
+        return mEventRepository;
+    }
+
+    public BlockChainStatusRepository status() {
+        if (mStatusRepository == null) {
+            mStatusRepository = new BlockChainStatusRepository(mApiService);
+        }
+
+        return mStatusRepository;
+    }
+
+    public BlockChainCandidateRepository candidate() {
+        if (mBlockChainCandidateRepository == null) {
+            mBlockChainCandidateRepository = new BlockChainCandidateRepository(mApiService);
+        }
+
+        return mBlockChainCandidateRepository;
+    }
+
+    public BlockChainBlockRepository block() {
+        if (mBlockRepository == null) {
+            mBlockRepository = new BlockChainBlockRepository(mApiService);
+        }
+
+        return mBlockRepository;
+    }
+
     public BlockChainAccountRepository account() {
         if (mAccountRepository == null) {
             mAccountRepository = new BlockChainAccountRepository(mApiService);

src/main/java/network/minter/blockchain/MinterBlockChainApi.java

@@ -0,0 +1,17 @@
+package network.minter.blockchain.api;
+
+import network.minter.blockchain.models.BCResult;
+import network.minter.blockchain.models.BlockInfo;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+/**
+ * minter-android-blockchain. 2019
+ * @author Eduard Maximovich [edward.vstock@gmail.com]
+ */
+public interface BlockChainBlockEndpoint {
+
+    @GET("/block")
+    Call<BCResult<BlockInfo>> getByHeight(@Query("height") long height);
+}

src/main/java/network/minter/blockchain/api/BlockChainBlockEndpoint.java

@@ -0,0 +1,26 @@
+package network.minter.blockchain.api;
+
+import java.util.List;
+
+import network.minter.blockchain.models.BCResult;
+import network.minter.blockchain.models.CandidateItem;
+import network.minter.blockchain.models.CandidateStatus;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+/**
+ * minter-android-blockchain. 2019
+ * @author Eduard Maximovich [edward.vstock@gmail.com]
+ */
+public interface BlockChainCandidateEndpoint {
+
+    @GET("/candidate")
+    Call<BCResult<CandidateItem>> getCandidate(@Query("pubkey") String pubKey);
+
+    @GET("/candidate")
+    Call<BCResult<CandidateItem>> getCandidate(@Query("pubkey") String pubKey, long blockHeight);
+
+    @GET("/candidates")
+    Call<BCResult<List<CandidateStatus>>> getCandidates(@Query("height") long blockHeight);
+}

src/main/java/network/minter/blockchain/api/BlockChainCandidateEndpoint.java

@@ -58,7 +58,7 @@ public interface BlockChainCoinEndpoint {
      * @param coinToBuy   coin to convert to
      * @return
      */
-    @GET("/api/estimate_coin_sell")
+    @GET("/estimate_coin_sell")
     Call<BCResult<ExchangeSellValue>> getCoinExchangeCurrencyToSell(
             @Query("coin_to_sell") String coinToSell,
             @Query("value_to_sell") String valueToSell,
@@ -73,7 +73,7 @@ Call<BCResult<ExchangeSellValue>> getCoinExchangeCurrencyToSell(
      * @param coinToBuy  coin to convert to
      * @return
      */
-    @GET("/api/estimate_coin_buy")
+    @GET("/estimate_coin_buy")
     Call<BCResult<ExchangeBuyValue>> getCoinExchangeCurrencyToBuy(
             @Query("coin_to_sell") String coinToSell,
             @Query("value_to_buy") String valueToBuy,

src/main/java/network/minter/blockchain/api/BlockChainCoinEndpoint.java

@@ -0,0 +1,17 @@
+package network.minter.blockchain.api;
+
+import network.minter.blockchain.models.BCResult;
+import network.minter.blockchain.models.EventList;
+import retrofit2.Call;
+import retrofit2.http.GET;
+import retrofit2.http.Query;
+
+/**
+ * minter-android-blockchain. 2019
+ * @author Eduard Maximovich [edward.vstock@gmail.com]
+ */
+public interface BlockChainEventEndpoint {
+
+    @GET("/events")
+    Call<BCResult<EventList>> getByHeight(@Query("height") long height);
+}

src/main/java/network/minter/blockchain/api/BlockChainEventEndpoint.java

@@ -26,6 +26,8 @@
 
 package network.minter.blockchain.api;
 
+import java.util.List;
+
 import network.minter.blockchain.models.BCResult;
 import network.minter.blockchain.models.NetworkStatus;
 import retrofit2.Call;
@@ -37,6 +39,9 @@
  */
 public interface BlockChainStatusEndpoint {
 
-    @GET("status")
+    @GET("/status")
     Call<BCResult<NetworkStatus>> status();
+
+    @GET("/validators")
+    Call<BCResult<List<NetworkStatus.Validator>>> validators();
 }