fix tests and checkstyle

Author: nkramer44

xrpl4j-core/src/main/java/org/xrpl/xrpl4j/model/jackson/modules/MpTokenMetadataSerializer.java

@@ -28,7 +28,7 @@
 import java.io.IOException;
 
 /**
- * Custom Jackson serializer for {@link MpTokenIssuanceId}s.
+ * Custom Jackson serializer for {@link MpTokenMetadata}s.
  */
 public class MpTokenMetadataSerializer extends StdScalarSerializer<MpTokenMetadata> {
 

xrpl4j-core/src/test/java/org/xrpl/xrpl4j/model/transactions/metadata/MetaLedgerEntryTypeTest.java

@@ -35,7 +35,9 @@ void testConstants() {
       .isEqualTo("XChainOwnedCreateAccountClaimID");
     assertThat(MetaLedgerEntryType.XCHAIN_OWNED_CLAIM_ID.value()).isEqualTo("XChainOwnedClaimID");
     assertThat(MetaLedgerEntryType.DID.value()).isEqualTo("DID");
-    assertThat(MetaLedgerEntryType.MP_TOKEN.value()).isEqualTo("Oracle");
+    assertThat(MetaLedgerEntryType.ORACLE.value()).isEqualTo("Oracle");
+    assertThat(MetaLedgerEntryType.MP_TOKEN.value()).isEqualTo("MPToken");
+    assertThat(MetaLedgerEntryType.MP_TOKEN_ISSUANCE.value()).isEqualTo("MPTokenIssuance");
   }
 
   @Test
@@ -64,7 +66,9 @@ void testLedgerObjectType() {
       MetaXChainOwnedClaimIdObject.class
     );
     assertThat(MetaLedgerEntryType.DID.ledgerObjectType()).isEqualTo(MetaDidObject.class);
-    assertThat(MetaLedgerEntryType.MP_TOKEN.ledgerObjectType()).isEqualTo(MetaOracleObject.class);
+    assertThat(MetaLedgerEntryType.ORACLE.ledgerObjectType()).isEqualTo(MetaOracleObject.class);
+    assertThat(MetaLedgerEntryType.MP_TOKEN.ledgerObjectType()).isEqualTo(MetaMpTokenObject.class);
+    assertThat(MetaLedgerEntryType.MP_TOKEN_ISSUANCE.ledgerObjectType()).isEqualTo(MetaMpTokenIssuanceObject.class);
   }
 
   @Test

xrpl4j-integration-tests/src/test/java/org/xrpl/xrpl4j/tests/AccountSetIT.java

@@ -25,17 +25,12 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.base.Strings;
 import com.google.common.primitives.UnsignedInteger;
-import okhttp3.HttpUrl;
 import org.junit.jupiter.api.Test;
 import org.xrpl.xrpl4j.client.JsonRpcClientErrorException;
-import org.xrpl.xrpl4j.client.faucet.FaucetClient;
-import org.xrpl.xrpl4j.client.faucet.FundAccountRequest;
 import org.xrpl.xrpl4j.crypto.keys.KeyPair;
-import org.xrpl.xrpl4j.crypto.keys.Seed;
 import org.xrpl.xrpl4j.crypto.signing.SingleSignedTransaction;
 import org.xrpl.xrpl4j.crypto.signing.bc.BcSignatureService;
 import org.xrpl.xrpl4j.model.client.accounts.AccountInfoResult;
-import org.xrpl.xrpl4j.model.client.common.LedgerIndex;
 import org.xrpl.xrpl4j.model.client.common.LedgerSpecifier;
 import org.xrpl.xrpl4j.model.client.fees.FeeResult;
 import org.xrpl.xrpl4j.model.client.fees.FeeUtils;
@@ -49,13 +44,7 @@
 import org.xrpl.xrpl4j.model.ledger.LedgerObject;
 import org.xrpl.xrpl4j.model.transactions.AccountSet;
 import org.xrpl.xrpl4j.model.transactions.AccountSet.AccountSetFlag;
-import org.xrpl.xrpl4j.model.transactions.Address;
-import org.xrpl.xrpl4j.model.transactions.ImmutableTrustSet;
-import org.xrpl.xrpl4j.model.transactions.IssuedCurrencyAmount;
-import org.xrpl.xrpl4j.model.transactions.TrustSet;
-import org.xrpl.xrpl4j.model.transactions.XrpCurrencyAmount;
 
-import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
@@ -66,60 +55,6 @@
  */
 public class AccountSetIT extends AbstractIT {
 
-  @Test
-  void name2() throws JsonRpcClientErrorException, JsonProcessingException {
-    KeyPair keyPair1 = constructRandomAccount();
-    KeyPair keyPair2 = constructRandomAccount();
-
-    AccountInfoResult accountInfo1 = this.scanForResult(
-      () -> this.getValidatedAccountInfo(keyPair1.publicKey().deriveAddress())
-    );
-    AccountInfoResult accountInfo2 = this.scanForResult(
-      () -> this.getValidatedAccountInfo(keyPair2.publicKey().deriveAddress())
-    );
-
-    ImmutableTrustSet trustSet1 = TrustSet.builder()
-      .account(keyPair1.publicKey().deriveAddress())
-      .sequence(accountInfo1.accountData().sequence())
-      .fee(XrpCurrencyAmount.ofXrp(BigDecimal.ONE))
-      .lastLedgerSequence(
-        accountInfo1.ledgerIndexSafe().plus(LedgerIndex.of(UnsignedInteger.valueOf(10))).unsignedIntegerValue())
-      .limitAmount(
-        IssuedCurrencyAmount.builder()
-          .currency("USD")
-          .value("100000")
-          .issuer(Address.of("rne3bStAJifMTBg7WzsmwzaMMY5XhAAuRe"))
-          .build()
-      )
-      .signingPublicKey(keyPair1.publicKey())
-      .build();
-
-    ImmutableTrustSet trustSet2 = TrustSet.builder()
-      .account(keyPair2.publicKey().deriveAddress())
-      .sequence(accountInfo2.accountData().sequence())
-      .fee(XrpCurrencyAmount.ofXrp(BigDecimal.ONE))
-      .lastLedgerSequence(
-        accountInfo2.ledgerIndexSafe().plus(LedgerIndex.of(UnsignedInteger.valueOf(10))).unsignedIntegerValue())
-      .limitAmount(
-        IssuedCurrencyAmount.builder()
-          .currency("USD")
-          .value("100000")
-          .issuer(Address.of("rne3bStAJifMTBg7WzsmwzaMMY5XhAAuRe"))
-          .build()
-      )
-      .signingPublicKey(keyPair2.publicKey())
-      .build();
-
-    SingleSignedTransaction<ImmutableTrustSet> signed1 = signatureService.sign(keyPair1.privateKey(), trustSet1);
-    SingleSignedTransaction<ImmutableTrustSet> signed2 = signatureService.sign(keyPair2.privateKey(), trustSet2);
-    SubmitResult<ImmutableTrustSet> submitResult1 = xrplClient.submit(signed1);
-    SubmitResult<ImmutableTrustSet> submitResult2 = xrplClient.submit(signed2);
-    assertThat(submitResult1.engineResult()).isEqualTo("tesSUCCESS");
-    assertThat(submitResult2.engineResult()).isEqualTo("tesSUCCESS");
-    System.out.printf("Account: %s. TrustSet hash: %s%n", keyPair1.publicKey().deriveAddress(), signed1.hash());
-    System.out.printf("Account: %s. TrustSet hash: %s%n", keyPair2.publicKey().deriveAddress(), signed2.hash());
-  }
-
   @Test
   public void enableAllAndDisableOne() throws JsonRpcClientErrorException, JsonProcessingException {
 

xrpl4j-integration-tests/src/test/java/org/xrpl/xrpl4j/tests/MpTokenIT.java

@@ -42,7 +42,8 @@
 public class MpTokenIT extends AbstractIT {
 
   @Test
-  void createIssuanceThenPayThenLockThenClawbackThenDestroy() throws JsonRpcClientErrorException, JsonProcessingException {
+  void createIssuanceThenPayThenLockThenClawbackThenDestroy()
+    throws JsonRpcClientErrorException, JsonProcessingException {
     KeyPair issuerKeyPair = createRandomAccountEd25519();
 
     FeeResult feeResult = xrplClient.fee();
@@ -168,7 +169,9 @@ void createIssuanceThenPayThenLockThenClawbackThenDestroy() throws JsonRpcClient
       .destination(holder1KeyPair.publicKey().deriveAddress())
       .amount(mintAmount)
       .signingPublicKey(issuerKeyPair.publicKey())
-      .lastLedgerSequence(issuerAccountInfo.ledgerIndexSafe().plus(UnsignedInteger.valueOf(1000)).unsignedIntegerValue())
+      .lastLedgerSequence(
+        issuerAccountInfo.ledgerIndexSafe().plus(UnsignedInteger.valueOf(1000)).unsignedIntegerValue()
+      )
       .build();
 
     SingleSignedTransaction<Payment> signedMint = signatureService.sign(issuerKeyPair.privateKey(), mint);
@@ -263,7 +266,9 @@ void createIssuanceThenPayThenLockThenClawbackThenDestroy() throws JsonRpcClient
       .fee(lock.fee())
       .sequence(lock.sequence().plus(UnsignedInteger.ONE))
       .signingPublicKey(issuerKeyPair.publicKey())
-      .lastLedgerSequence(lockSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(50)).unsignedIntegerValue())
+      .lastLedgerSequence(
+        lockSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(50)).unsignedIntegerValue()
+      )
       .amount(mintAmount)
       .holder(holder1KeyPair.publicKey().deriveAddress())
       .build();
@@ -298,7 +303,9 @@ void createIssuanceThenPayThenLockThenClawbackThenDestroy() throws JsonRpcClient
       .sequence(authorize.sequence().plus(UnsignedInteger.ONE))
       .fee(FeeUtils.computeNetworkFees(feeResult).recommendedFee())
       .signingPublicKey(holder1KeyPair.publicKey())
-      .lastLedgerSequence(clawbackSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(100)).unsignedIntegerValue())
+      .lastLedgerSequence(
+        clawbackSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(100)).unsignedIntegerValue()
+      )
       .mpTokenIssuanceId(mpTokenIssuanceId)
       .flags(MpTokenAuthorizeFlags.UNAUTHORIZE)
       .build();
@@ -336,7 +343,9 @@ void createIssuanceThenPayThenLockThenClawbackThenDestroy() throws JsonRpcClient
       .fee(lock.fee())
       .sequence(clawback.sequence().plus(UnsignedInteger.ONE))
       .signingPublicKey(issuerKeyPair.publicKey())
-      .lastLedgerSequence(unAuthorizeSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(50)).unsignedIntegerValue())
+      .lastLedgerSequence(
+        unAuthorizeSubmitResult.validatedLedgerIndex().plus(UnsignedInteger.valueOf(50)).unsignedIntegerValue()
+      )
       .mpTokenIssuanceId(mpTokenIssuanceId)
       .build();