Backport to branch(3) : Refactor AssetProofComposer (#336)

Co-authored-by: Jun Nemoto <35618893+jnmt@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: 3 people

ledger/src/integration-test/java/com/scalar/dl/ledger/service/Constants.java

@@ -50,51 +50,6 @@ public class Constants {
   public static final String ASSET_AGE_COLUMN_NAME = "age";
   public static final String ASSET_OUTPUT_COLUMN_NAME = "output";
 
-  public static final String PRIVATE_KEY_A =
-      "-----BEGIN EC PRIVATE KEY-----\n"
-          + "MHcCAQEEIF4SjQxTArRcZaROSFjlBP2rR8fAKtL8y+kmGiSlM5hEoAoGCCqGSM49\n"
-          + "AwEHoUQDQgAEY0i/iAFxIBS3etbjoSC1/aUKQV66+wiawL4bZqklu86ObIc7wrif\n"
-          + "HExPmVhKFSklOyZqGoOiVZA0zf0LZeFaPA==\n"
-          + "-----END EC PRIVATE KEY-----";
-  public static final String PRIVATE_KEY_B =
-      "-----BEGIN EC PRIVATE KEY-----\n"
-          + "MHcCAQEEIAHSsi6IZaB4aO7qbvkf4uv4HIAHNdMH2l6YDGyyYzY+oAoGCCqGSM49\n"
-          + "AwEHoUQDQgAEDhDSlG3KmPN2zK16AFB68vSa4M5MLuEtNSL7c1/ul8b6HKrq9Ivo\n"
-          + "xmxDUidA3pmIotkcjPtMSAxoDC98NjV2Aw==\n"
-          + "-----END EC PRIVATE KEY-----";
-  public static final String CERTIFICATE_A =
-      "-----BEGIN CERTIFICATE-----\n"
-          + "MIICQTCCAeagAwIBAgIUEKARigcZQ3sLEXdlEtjYissVx0cwCgYIKoZIzj0EAwIw\n"
-          + "QTELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5bzES\n"
-          + "MBAGA1UEChMJU2FtcGxlIENBMB4XDTE4MDYyMTAyMTUwMFoXDTE5MDYyMTAyMTUw\n"
-          + "MFowRTELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5\n"
-          + "bzEWMBQGA1UEChMNU2FtcGxlIENsaWVudDBZMBMGByqGSM49AgEGCCqGSM49AwEH\n"
-          + "A0IABGNIv4gBcSAUt3rW46Egtf2lCkFeuvsImsC+G2apJbvOjmyHO8K4nxxMT5lY\n"
-          + "ShUpJTsmahqDolWQNM39C2XhWjyjgbcwgbQwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud\n"
-          + "JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW\n"
-          + "BBTpBQl/JxB7yr77uMVT9mMicPeVJTAfBgNVHSMEGDAWgBQrJo3N3/0j3oPS6F6m\n"
-          + "wunHe8xLpzA1BgNVHREELjAsghJjbGllbnQuZXhhbXBsZS5jb22CFnd3dy5jbGll\n"
-          + "bnQuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSQAwRgIhAJPtXSzuncDJXnM+7us8\n"
-          + "46MEVjGHJy70bRY1My23RkxbAiEA5oFgTKMvls8e4UpnmUgFNP+FH8a5bF4tUPaV\n"
-          + "BQiBbgk=\n"
-          + "-----END CERTIFICATE-----";
-  public static final String CERTIFICATE_B =
-      "-----BEGIN CERTIFICATE-----\n"
-          + "MIICjDCCAjKgAwIBAgIUTnLDk2Y+84DRD8bbQuZE1xlxidkwCgYIKoZIzj0EAwIw\n"
-          + "bzELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5bzEf\n"
-          + "MB0GA1UEChMWU2FtcGxlIEludGVybWVkaWF0ZSBDQTEfMB0GA1UEAxMWU2FtcGxl\n"
-          + "IEludGVybWVkaWF0ZSBDQTAeFw0xODA4MDkwNzAwMDBaFw0yMTA4MDgwNzAwMDBa\n"
-          + "MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ\n"
-          + "bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC\n"
-          + "AAQOENKUbcqY83bMrXoAUHry9Jrgzkwu4S01IvtzX+6Xxvocqur0i+jGbENSJ0De\n"
-          + "mYii2RyM+0xIDGgML3w2NXYDo4HVMIHSMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUE\n"
-          + "DDAKBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSsklJebvmvOepv\n"
-          + "QhvsCVFO4h+z+jAfBgNVHSMEGDAWgBT0HscZ7eRWv8QlQgfbtaT7BDNQEzAxBggr\n"
-          + "BgEFBQcBAQQlMCMwIQYIKwYBBQUHMAGGFWh0dHA6Ly9sb2NhbGhvc3Q6ODg4OTAq\n"
-          + "BgNVHR8EIzAhMB+gHaAbhhlodHRwOi8vbG9jYWxob3N0Ojg4ODgvY3JsMAoGCCqG\n"
-          + "SM49BAMCA0gAMEUCIAJavUnxqZm/a/szytCNdmESZdL++H71+YHHuTkxud8DAiEA\n"
-          + "6GUKwnt7oDqLgoavBNhBVmbmxMJjo+D3YEwTOJ/X4bs=\n"
-          + "-----END CERTIFICATE-----";
   public static final String SECRET_KEY_A = "secret_key_A";
   public static final String SECRET_KEY_B = "secret_key_B";
   public static final String SOME_CIPHER_KEY = "cipher_key";

ledger/src/integration-test/java/com/scalar/dl/ledger/service/LedgerServiceEndToEndTest.java

@@ -8,8 +8,6 @@
 import static com.scalar.dl.ledger.service.Constants.ASSET_OUTPUT_COLUMN_NAME;
 import static com.scalar.dl.ledger.service.Constants.AUDITOR_ENTITY_ID;
 import static com.scalar.dl.ledger.service.Constants.BALANCE_ATTRIBUTE_NAME;
-import static com.scalar.dl.ledger.service.Constants.CERTIFICATE_A;
-import static com.scalar.dl.ledger.service.Constants.CERTIFICATE_B;
 import static com.scalar.dl.ledger.service.Constants.CONTRACT_ID_ATTRIBUTE_NAME;
 import static com.scalar.dl.ledger.service.Constants.CREATE_CONTRACT_ID1;
 import static com.scalar.dl.ledger.service.Constants.CREATE_CONTRACT_ID2;
@@ -38,8 +36,6 @@
 import static com.scalar.dl.ledger.service.Constants.PAYMENT_CONTRACT_ID2;
 import static com.scalar.dl.ledger.service.Constants.PAYMENT_CONTRACT_ID3;
 import static com.scalar.dl.ledger.service.Constants.PAYMENT_CONTRACT_ID4;
-import static com.scalar.dl.ledger.service.Constants.PRIVATE_KEY_A;
-import static com.scalar.dl.ledger.service.Constants.PRIVATE_KEY_B;
 import static com.scalar.dl.ledger.service.Constants.SECRET_KEY_A;
 import static com.scalar.dl.ledger.service.Constants.SECRET_KEY_B;
 import static com.scalar.dl.ledger.service.Constants.SOME_AMOUNT_1;
@@ -49,6 +45,10 @@
 import static com.scalar.dl.ledger.service.Constants.SOME_ASSET_ID_2;
 import static com.scalar.dl.ledger.service.Constants.SOME_CIPHER_KEY;
 import static com.scalar.dl.ledger.service.Constants.SOME_ID;
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_A;
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_B;
+import static com.scalar.dl.ledger.test.TestConstants.PRIVATE_KEY_A;
+import static com.scalar.dl.ledger.test.TestConstants.PRIVATE_KEY_B;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.assertj.core.api.AssertionsForClassTypes.catchThrowable;

ledger/src/integration-test/java/com/scalar/dl/ledger/service/LedgerServiceIntegrationTest.java

@@ -4,8 +4,6 @@
 import static com.scalar.dl.ledger.service.Constants.ASSETS_ATTRIBUTE_NAME;
 import static com.scalar.dl.ledger.service.Constants.ASSET_ATTRIBUTE_NAME;
 import static com.scalar.dl.ledger.service.Constants.BALANCE_ATTRIBUTE_NAME;
-import static com.scalar.dl.ledger.service.Constants.CERTIFICATE_A;
-import static com.scalar.dl.ledger.service.Constants.CERTIFICATE_B;
 import static com.scalar.dl.ledger.service.Constants.CONTRACT_ID_ATTRIBUTE_NAME;
 import static com.scalar.dl.ledger.service.Constants.CREATE_CONTRACT_ID1;
 import static com.scalar.dl.ledger.service.Constants.CREATE_CONTRACT_ID2;
@@ -23,8 +21,6 @@
 import static com.scalar.dl.ledger.service.Constants.ID_ATTRIBUTE_NAME;
 import static com.scalar.dl.ledger.service.Constants.KEY_VERSION;
 import static com.scalar.dl.ledger.service.Constants.PAYMENT_CONTRACT_ID1;
-import static com.scalar.dl.ledger.service.Constants.PRIVATE_KEY_A;
-import static com.scalar.dl.ledger.service.Constants.PRIVATE_KEY_B;
 import static com.scalar.dl.ledger.service.Constants.SECRET_KEY_A;
 import static com.scalar.dl.ledger.service.Constants.SECRET_KEY_B;
 import static com.scalar.dl.ledger.service.Constants.SOME_AMOUNT_1;
@@ -35,6 +31,10 @@
 import static com.scalar.dl.ledger.service.Constants.SOME_BALANCE;
 import static com.scalar.dl.ledger.service.Constants.SOME_ID;
 import static com.scalar.dl.ledger.service.Constants.SOME_NONCE;
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_A;
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_B;
+import static com.scalar.dl.ledger.test.TestConstants.PRIVATE_KEY_A;
+import static com.scalar.dl.ledger.test.TestConstants.PRIVATE_KEY_B;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;

…atabase/scalardb/AssetProofComposer.java …/ledger/database/AssetProofComposer.javaledger/src/main/java/com/scalar/dl/ledger/database/scalardb/AssetProofComposer.java renamed to ledger/src/main/java/com/scalar/dl/ledger/database/AssetProofComposer.java ledger/src/main/java/com/scalar/dl/ledger/database/scalardb/AssetProofComposer.java renamed to ledger/src/main/java/com/scalar/dl/ledger/database/AssetProofComposer.java

@@ -1,7 +1,6 @@
-package com.scalar.dl.ledger.database.scalardb;
+package com.scalar.dl.ledger.database;
 
 import com.google.inject.Inject;
-import com.scalar.db.api.Put;
 import com.scalar.dl.ledger.crypto.SignatureSigner;
 import com.scalar.dl.ledger.proof.AssetProof;
 import com.scalar.dl.ledger.statemachine.InternalAsset;
@@ -18,30 +17,6 @@ public AssetProofComposer(@Nullable SignatureSigner signer) {
     this.signer = signer;
   }
 
-  // TODO: remove this to make it not dependent on ScalarDB
-  public AssetProof create(Put p, String nonce) {
-    if (signer == null) {
-      return null;
-    }
-    String id = p.getPartitionKey().get().get(0).getAsString().get();
-    int age = p.getClusteringKey().get().get().get(0).getAsInt();
-    String input = p.getValues().get(AssetAttribute.INPUT).getAsString().get();
-    byte[] hash = p.getValues().get(AssetAttribute.HASH).getAsBytes().get();
-    byte[] prevHash = p.getValues().get(AssetAttribute.PREV_HASH).getAsBytes().orElse(null);
-    byte[] signature = signer.sign(AssetProof.serialize(id, age, nonce, input, hash, prevHash));
-
-    // TODO: add other fields
-    return AssetProof.newBuilder()
-        .id(id)
-        .age(age)
-        .nonce(nonce)
-        .input(input)
-        .hash(hash)
-        .prevHash(prevHash)
-        .signature(signature)
-        .build();
-  }
-
   public AssetProof create(InternalAsset asset) {
     return create(asset, null);
   }

ledger/src/main/java/com/scalar/dl/ledger/database/scalardb/ScalarTamperEvidentAssetLedger.java

@@ -18,6 +18,7 @@
 import com.scalar.db.io.TextValue;
 import com.scalar.dl.ledger.config.LedgerConfig;
 import com.scalar.dl.ledger.database.AssetFilter;
+import com.scalar.dl.ledger.database.AssetProofComposer;
 import com.scalar.dl.ledger.database.AssetRecord;
 import com.scalar.dl.ledger.database.Snapshot;
 import com.scalar.dl.ledger.database.TamperEvidentAssetLedger;
@@ -264,7 +265,7 @@ private List<AssetProof> createProofs(
         .filter(p -> p.forTable().get().equals(ScalarTamperEvidentAssetLedger.TABLE))
         .forEach(
             p -> {
-              AssetProof proof = proofComposer.create(p, nonce);
+              AssetProof proof = createProofFrom(p, nonce);
               proofs.putIfAbsent(proof.getId(), proof);
             });
 
@@ -274,6 +275,15 @@ private List<AssetProof> createProofs(
     return new ArrayList<>(proofs.values());
   }
 
+  private AssetProof createProofFrom(Put p, String nonce) {
+    String id = p.getPartitionKey().getColumns().get(0).getTextValue();
+    int age = p.getClusteringKey().get().getColumns().get(0).getIntValue();
+    String input = p.getTextValue(AssetAttribute.INPUT);
+    byte[] hash = p.getBlobValueAsBytes(AssetAttribute.HASH);
+    byte[] prevHash = p.getBlobValueAsBytes(AssetAttribute.PREV_HASH);
+    return proofComposer.create(id, age, nonce, input, hash, prevHash);
+  }
+
   static class Metadata {
     private static final String TABLE = "asset_metadata";
     private final DistributedTransaction transaction;

ledger/src/main/java/com/scalar/dl/ledger/database/scalardb/ScalarTransactionManager.java

@@ -12,6 +12,7 @@
 import com.scalar.db.transaction.consensuscommit.ConsensusCommitManager;
 import com.scalar.dl.ledger.config.LedgerConfig;
 import com.scalar.dl.ledger.database.AssetFilter;
+import com.scalar.dl.ledger.database.AssetProofComposer;
 import com.scalar.dl.ledger.database.MutableDatabase;
 import com.scalar.dl.ledger.database.Snapshot;
 import com.scalar.dl.ledger.database.TamperEvidentAssetLedger;

ledger/src/main/java/com/scalar/dl/ledger/service/LedgerValidationService.java

@@ -7,9 +7,9 @@
 import com.scalar.dl.ledger.crypto.ClientKeyValidator;
 import com.scalar.dl.ledger.crypto.SignatureValidator;
 import com.scalar.dl.ledger.database.AssetFilter;
+import com.scalar.dl.ledger.database.AssetProofComposer;
 import com.scalar.dl.ledger.database.Transaction;
 import com.scalar.dl.ledger.database.TransactionManager;
-import com.scalar.dl.ledger.database.scalardb.AssetProofComposer;
 import com.scalar.dl.ledger.error.LedgerError;
 import com.scalar.dl.ledger.exception.LedgerException;
 import com.scalar.dl.ledger.exception.ValidationException;

ledger/src/main/java/com/scalar/dl/ledger/service/ValidationService.java

@@ -5,8 +5,8 @@
 import com.scalar.dl.ledger.contract.ContractMachine;
 import com.scalar.dl.ledger.contract.ContractManager;
 import com.scalar.dl.ledger.crypto.ClientKeyValidator;
+import com.scalar.dl.ledger.database.AssetProofComposer;
 import com.scalar.dl.ledger.database.TransactionManager;
-import com.scalar.dl.ledger.database.scalardb.AssetProofComposer;
 import com.scalar.dl.ledger.model.LedgerValidationRequest;
 import com.scalar.dl.ledger.model.LedgerValidationResult;
 import com.scalar.dl.ledger.statemachine.DeserializationType;

ledger/src/test/java/com/scalar/dl/ledger/contract/ContractManagerTest.java

@@ -1,5 +1,8 @@
 package com.scalar.dl.ledger.contract;
 
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_A;
+import static com.scalar.dl.ledger.test.TestConstants.CERTIFICATE_B;
+import static com.scalar.dl.ledger.test.TestConstants.PRIVATE_KEY_A;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.assertj.core.api.Assertions.catchThrowable;
@@ -36,45 +39,6 @@
 import org.mockito.MockitoAnnotations;
 
 public class ContractManagerTest {
-  private static final String PRIVATE_KEY_A =
-      "-----BEGIN EC PRIVATE KEY-----\n"
-          + "MHcCAQEEIF4SjQxTArRcZaROSFjlBP2rR8fAKtL8y+kmGiSlM5hEoAoGCCqGSM49\n"
-          + "AwEHoUQDQgAEY0i/iAFxIBS3etbjoSC1/aUKQV66+wiawL4bZqklu86ObIc7wrif\n"
-          + "HExPmVhKFSklOyZqGoOiVZA0zf0LZeFaPA==\n"
-          + "-----END EC PRIVATE KEY-----";
-  private static final String CERTIFICATE_A =
-      "-----BEGIN CERTIFICATE-----\n"
-          + "MIICQTCCAeagAwIBAgIUEKARigcZQ3sLEXdlEtjYissVx0cwCgYIKoZIzj0EAwIw\n"
-          + "QTELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5bzES\n"
-          + "MBAGA1UEChMJU2FtcGxlIENBMB4XDTE4MDYyMTAyMTUwMFoXDTE5MDYyMTAyMTUw\n"
-          + "MFowRTELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5\n"
-          + "bzEWMBQGA1UEChMNU2FtcGxlIENsaWVudDBZMBMGByqGSM49AgEGCCqGSM49AwEH\n"
-          + "A0IABGNIv4gBcSAUt3rW46Egtf2lCkFeuvsImsC+G2apJbvOjmyHO8K4nxxMT5lY\n"
-          + "ShUpJTsmahqDolWQNM39C2XhWjyjgbcwgbQwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud\n"
-          + "JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW\n"
-          + "BBTpBQl/JxB7yr77uMVT9mMicPeVJTAfBgNVHSMEGDAWgBQrJo3N3/0j3oPS6F6m\n"
-          + "wunHe8xLpzA1BgNVHREELjAsghJjbGllbnQuZXhhbXBsZS5jb22CFnd3dy5jbGll\n"
-          + "bnQuZXhhbXBsZS5jb20wCgYIKoZIzj0EAwIDSQAwRgIhAJPtXSzuncDJXnM+7us8\n"
-          + "46MEVjGHJy70bRY1My23RkxbAiEA5oFgTKMvls8e4UpnmUgFNP+FH8a5bF4tUPaV\n"
-          + "BQiBbgk=\n"
-          + "-----END CERTIFICATE-----";
-  private static final String CERTIFICATE_B =
-      "-----BEGIN CERTIFICATE-----\n"
-          + "MIICjDCCAjKgAwIBAgIUTnLDk2Y+84DRD8bbQuZE1xlxidkwCgYIKoZIzj0EAwIw\n"
-          + "bzELMAkGA1UEBhMCSlAxDjAMBgNVBAgTBVRva3lvMQ4wDAYDVQQHEwVUb2t5bzEf\n"
-          + "MB0GA1UEChMWU2FtcGxlIEludGVybWVkaWF0ZSBDQTEfMB0GA1UEAxMWU2FtcGxl\n"
-          + "IEludGVybWVkaWF0ZSBDQTAeFw0xODA4MDkwNzAwMDBaFw0yMTA4MDgwNzAwMDBa\n"
-          + "MEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJ\n"
-          + "bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwWTATBgcqhkjOPQIBBggqhkjOPQMBBwNC\n"
-          + "AAQOENKUbcqY83bMrXoAUHry9Jrgzkwu4S01IvtzX+6Xxvocqur0i+jGbENSJ0De\n"
-          + "mYii2RyM+0xIDGgML3w2NXYDo4HVMIHSMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUE\n"
-          + "DDAKBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSsklJebvmvOepv\n"
-          + "QhvsCVFO4h+z+jAfBgNVHSMEGDAWgBT0HscZ7eRWv8QlQgfbtaT7BDNQEzAxBggr\n"
-          + "BgEFBQcBAQQlMCMwIQYIKwYBBQUHMAGGFWh0dHA6Ly9sb2NhbGhvc3Q6ODg4OTAq\n"
-          + "BgNVHR8EIzAhMB+gHaAbhhlodHRwOi8vbG9jYWxob3N0Ojg4ODgvY3JsMAoGCCqG\n"
-          + "SM49BAMCA0gAMEUCIAJavUnxqZm/a/szytCNdmESZdL++H71+YHHuTkxud8DAiEA\n"
-          + "6GUKwnt7oDqLgoavBNhBVmbmxMJjo+D3YEwTOJ/X4bs=\n"
-          + "-----END CERTIFICATE-----";
   private static final String ANY_CONTRACT_ID = "MyCreate";
   private static final String ANY_CONTRACT_NAME = "Create";
   private static final byte[] ANY_BYTE_CODE = "byte_code".getBytes(StandardCharsets.UTF_8);

ledger/src/test/java/com/scalar/dl/ledger/database/scalardb/ScalarTamperEvidentAssetLedgerTest.java

@@ -33,6 +33,7 @@
 import com.scalar.dl.ledger.config.LedgerConfig;
 import com.scalar.dl.ledger.crypto.DigitalSignatureSigner;
 import com.scalar.dl.ledger.database.AssetFilter;
+import com.scalar.dl.ledger.database.AssetProofComposer;
 import com.scalar.dl.ledger.database.AssetRecord;
 import com.scalar.dl.ledger.database.Snapshot;
 import com.scalar.dl.ledger.database.TransactionState;