#149 #150 remove deprecated functions and update default values

kryptokrauts · Apr 9, 2021 · 4c8e1fe · 4c8e1fe
1 parent bb8a502
commit 4c8e1fe
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 96 deletions.
diff --git a/src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/BaseTest.java b/src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/BaseTest.java
@@ -26,6 +26,7 @@
 import io.vertx.ext.unit.junit.VertxUnitRunner;
 import java.math.BigInteger;
 import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import javax.naming.ConfigurationException;
@@ -257,10 +258,14 @@ protected void waitForBlockHeight(BigInteger blockHeight, Long timeoutMilli) thr
   }
 
   protected String encodeCalldata(
-      String contractSourceCode, String contractFunction, List<String> contractFunctionParams) {
+      String contractSourceCode,
+      String contractFunction,
+      List<String> contractFunctionParams,
+      Map<String, String> fileSystem) {
     return this.aeternityServiceNative
         .compiler
-        .blockingEncodeCalldata(contractSourceCode, contractFunction, contractFunctionParams)
+        .blockingEncodeCalldata(
+            contractSourceCode, contractFunction, contractFunctionParams, fileSystem)
         .getResult();
   }
 
@@ -273,7 +278,7 @@ protected JsonObject decodeCalldata(String encodedValue, String sophiaReturnType
   protected ObjectResultWrapper decodeCallResult(
       String source, String function, String callResult, String callValue) {
     return this.aeternityServiceNative.compiler.blockingDecodeCallResult(
-        source, function, callResult, callValue);
+        source, function, callResult, callValue, null);
   }
 
   protected <T> T callMethodAndAwaitException(

diff --git a/...rationTest/java/com/kryptokrauts/aeternity/generated/api/PaymentSplitterContractTest.java b/...rationTest/java/com/kryptokrauts/aeternity/generated/api/PaymentSplitterContractTest.java
@@ -143,8 +143,7 @@ public void a_deployPaymentSplitterTest(TestContext context) throws Throwable {
             context.assertEquals("ok", dryRunResult.getResult());
 
             contractCreate =
-                contractCreate
-                    .toBuilder()
+                contractCreate.toBuilder()
                     .gas(dryRunResult.getContractCallObject().getGasUsed())
                     .gasPrice(dryRunResult.getContractCallObject().getGasPrice())
                     .build();
@@ -291,7 +290,8 @@ public void c_callGetTotalAmountSplitted(TestContext context) throws Throwable {
             String calldata =
                 aeternityServiceNative
                     .compiler
-                    .blockingEncodeCalldata(paymentSplitterSource, "getTotalAmountSplitted", null)
+                    .blockingEncodeCalldata(
+                        paymentSplitterSource, "getTotalAmountSplitted", null, null)
                     .getResult();
             _logger.info("Contract ID: " + localDeployedContractId);
 

diff --git a/src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/TestConstants.java b/src/integrationTest/java/com/kryptokrauts/aeternity/generated/api/TestConstants.java
@@ -5,7 +5,7 @@
 
 public interface TestConstants {
 
-  String testnetURL = "https://sdk-testnet.aepps.com";
+  String testnetURL = "https://testnet.aeternity.io";
 
   String testContractSourceCode = "contract Identity =\n  entrypoint main(z : int) = z";
 

diff --git a/...tegrationTest/java/com/kryptokrauts/aeternity/generated/api/TransactionContractsTest.java b/...tegrationTest/java/com/kryptokrauts/aeternity/generated/api/TransactionContractsTest.java
@@ -134,7 +134,8 @@ public void staticCallContractOnLocalNode(TestContext context) {
               encodeCalldata(
                   TestConstants.testContractSourceCode,
                   TestConstants.testContractFunction,
-                  TestConstants.testContractFunctionParams);
+                  TestConstants.testContractFunctionParams,
+                  null);
 
           DryRunTransactionResults results =
               this.aeternityServiceNative.transactions.blockingDryRunTransactions(
@@ -164,7 +165,8 @@ public void staticCallContractFailOnLocalNode(TestContext context) {
               encodeCalldata(
                   TestConstants.testContractSourceCode,
                   TestConstants.testContractFunction,
-                  TestConstants.testContractFunctionParams);
+                  TestConstants.testContractFunctionParams,
+                  null);
 
           DryRunTransactionResults results =
               this.aeternityServiceNative.transactions.blockingDryRunTransactions(
@@ -195,7 +197,8 @@ public void callContractAfterDryRunOnLocalNode(TestContext context) throws Throw
               encodeCalldata(
                   TestConstants.testContractSourceCode,
                   TestConstants.testContractFunction,
-                  TestConstants.testContractFunctionParams);
+                  TestConstants.testContractFunctionParams,
+                  null);
 
           DryRunTransactionResults results =
               this.aeternityServiceNative.transactions.blockingDryRunTransactions(

diff --git a/...est/java/com/kryptokrauts/aeternity/generated/api/TransactionGeneralizedAccountsTest.java b/...est/java/com/kryptokrauts/aeternity/generated/api/TransactionGeneralizedAccountsTest.java
@@ -155,7 +155,8 @@ public void testGaBlindAuthContract(TestContext context) {
               encodeCalldata(
                   TestConstants.testGABlindAuthContract,
                   "authorize",
-                  Arrays.asList(String.valueOf(new Random().nextInt())));
+                  Arrays.asList(String.valueOf(new Random().nextInt())),
+                  null);
 
           GeneralizedAccountsMetaTransactionModel gaMetaTx =
               GeneralizedAccountsMetaTransactionModel.builder()

diff --git a/src/main/java/com/kryptokrauts/aeternity/sdk/constants/BaseConstants.java b/src/main/java/com/kryptokrauts/aeternity/sdk/constants/BaseConstants.java
@@ -28,11 +28,11 @@ public interface BaseConstants {
   String VERTX_BASE_PATH = "basePath";
 
   // the default testnet url
-  String DEFAULT_TESTNET_URL = "https://sdk-testnet.aepps.com";
+  String DEFAULT_TESTNET_URL = "https://testnet.aeternity.io";
 
   // the default testnet compiler url
-  String DEFAULT_TESTNET_COMPILER_URL = "https://compiler.aepps.com";
+  String DEFAULT_TESTNET_COMPILER_URL = "https://compiler.aeternity.io";
 
   // the default testnet indaex url
-  String DEFAULT_TESTNET_INDAEX_URL = "https://testnet.aeternal.io/mdw";
+  String DEFAULT_TESTNET_INDAEX_URL = "https://testnet.aeternity.io/mdw";
 }
diff --git a/src/main/java/com/kryptokrauts/aeternity/sdk/service/compiler/CompilerService.java b/src/main/java/com/kryptokrauts/aeternity/sdk/service/compiler/CompilerService.java
@@ -9,20 +9,6 @@
 
 public interface CompilerService {
 
-  /**
-   * asynchronously gets the encoded calldata for this contractCode
-   *
-   * @deprecated use {@link CompilerService#asyncEncodeCalldata(String, String, List, Map)} instead.
-   *     this method will be removed in future releases
-   * @param contractCode the sourcecode of the contract
-   * @param function the name of the function to call
-   * @param arguments the params that should be passed to the function
-   * @return asynchronous result handler (RxJava Single) for encoded calldata
-   */
-  @Deprecated
-  Single<StringResultWrapper> asyncEncodeCalldata(
-      String contractCode, String function, List<String> arguments);
-
   /**
    * asynchronously gets the encoded calldata for this contractCode
    *
@@ -35,20 +21,6 @@ Single<StringResultWrapper> asyncEncodeCalldata(
   Single<StringResultWrapper> asyncEncodeCalldata(
       String contractCode, String function, List<String> arguments, Map<String, String> fileSystem);
 
-  /**
-   * synchronously gets the encoded calldata for this contractCode
-   *
-   * @deprecated use {@link CompilerService#blockingEncodeCalldata(String, String, List, Map)}
-   *     instead. this method will be removed in future releases
-   * @param contractCode the sourcecode of the contract
-   * @param function the name of the function to call
-   * @param arguments the params that should be passed to the function
-   * @return encoded calldata
-   */
-  @Deprecated
-  StringResultWrapper blockingEncodeCalldata(
-      String contractCode, String function, List<String> arguments);
-
   /**
    * synchronously gets the encoded calldata for this contractCode
    *
@@ -99,21 +71,6 @@ StringResultWrapper blockingEncodeCalldata(
    */
   ObjectResultWrapper blockingDecodeCalldata(String calldata, String sophiaType);
 
-  /**
-   * asynchronously decodes callresult of contract-calls
-   *
-   * @deprecated use {@link CompilerService#asyncDecodeCallResult(String, String, String, String,
-   *     Map)} instead. this method will be removed in future releases
-   * @param source the contract source
-   * @param function the called function
-   * @param callResult the received resultType (ok | error | revert)
-   * @param callValue the received value
-   * @return the decoded sophia call result
-   */
-  @Deprecated
-  Single<ObjectResultWrapper> asyncDecodeCallResult(
-      String source, String function, String callResult, String callValue);
-
   /**
    * asynchronously decodes callresult of contract-calls
    *
@@ -131,21 +88,6 @@ Single<ObjectResultWrapper> asyncDecodeCallResult(
       String callValue,
       Map<String, String> fileSystem);
 
-  /**
-   * synchronously decodes callresult of contract-calls
-   *
-   * @deprecated use {@link CompilerService#blockingDecodeCallResult(String, String, String, String,
-   *     Map)} instead. this method will be removed in future releases
-   * @param source the contract source
-   * @param function the called function
-   * @param callResult the received resultType (ok | error | revert)
-   * @param callValue the received value
-   * @return the decoded sophia call result
-   */
-  @Deprecated
-  ObjectResultWrapper blockingDecodeCallResult(
-      String source, String function, String callResult, String callValue);
-
   /**
    * synchronously decodes callresult of contract-calls
    *

diff --git a/.../java/com/kryptokrauts/aeternity/sdk/service/compiler/impl/SophiaCompilerServiceImpl.java b/.../java/com/kryptokrauts/aeternity/sdk/service/compiler/impl/SophiaCompilerServiceImpl.java
@@ -27,12 +27,6 @@ public final class SophiaCompilerServiceImpl implements CompilerService {
 
   @NonNull private DefaultApi compilerApi;
 
-  @Override
-  public Single<StringResultWrapper> asyncEncodeCalldata(
-      String sourceCode, String function, List<String> arguments) {
-    return this.asyncEncodeCalldata(sourceCode, function, arguments, null);
-  }
-
   @Override
   public Single<StringResultWrapper> asyncEncodeCalldata(
       String sourceCode, String function, List<String> arguments, Map<String, String> fileSystem) {
@@ -45,12 +39,6 @@ public Single<StringResultWrapper> asyncEncodeCalldata(
                 .map(calldata -> calldata.getCalldata()));
   }
 
-  @Override
-  public StringResultWrapper blockingEncodeCalldata(
-      String sourceCode, String function, List<String> arguments) {
-    return this.blockingEncodeCalldata(sourceCode, function, arguments, null);
-  }
-
   @Override
   public StringResultWrapper blockingEncodeCalldata(
       String sourceCode, String function, List<String> arguments, Map<String, String> fileSystem) {
@@ -104,12 +92,6 @@ public ObjectResultWrapper blockingDecodeCalldata(String calldata, String sophia
                         Optional.ofNullable(decodeResult).orElse(new SophiaJsonData()).getData()));
   }
 
-  @Override
-  public Single<ObjectResultWrapper> asyncDecodeCallResult(
-      String source, String function, String callResult, String callValue) {
-    return this.asyncDecodeCallResult(source, function, callResult, callValue, null);
-  }
-
   @Override
   public Single<ObjectResultWrapper> asyncDecodeCallResult(
       String source,
@@ -126,12 +108,6 @@ public Single<ObjectResultWrapper> asyncDecodeCallResult(
                 .map(decodeResult -> Optional.ofNullable(decodeResult).orElse("")));
   }
 
-  @Override
-  public ObjectResultWrapper blockingDecodeCallResult(
-      String source, String function, String callResult, String callValue) {
-    return this.blockingDecodeCallResult(source, function, callResult, callValue, null);
-  }
-
   @Override
   public ObjectResultWrapper blockingDecodeCallResult(
       String source,