Chore/protocolparams optimization (#178)

* chore: reduced ProtocolParams to the needed fields, removed unused. Replaced mappers with classic conversion

* fix: reverting the mappers. They will be optimized in a different branch

* fix: mapping only relevant fields

Author: Kammerlo

api/src/main/java/org/cardanofoundation/rosetta/api/block/model/domain/ProtocolParams.java

@@ -1,6 +1,5 @@
 package org.cardanofoundation.rosetta.api.block.model.domain;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Map;
 
@@ -11,7 +10,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 @Data
 @NoArgsConstructor
@@ -23,57 +21,20 @@ public class ProtocolParams {
 
   private Integer minFeeA; //0
   private Integer minFeeB; //1
-  private Integer maxBlockBodySize; //2
   private Integer maxTxSize; //3
-  private Integer maxBlockHeaderSize; //4
   private BigInteger keyDeposit; //5
   private BigInteger poolDeposit; //6
-  private Integer maxEpoch; //7
-  @JsonProperty("nOpt")
-  private Integer nOpt; //8
-  private BigDecimal poolPledgeInfluence; //rational //9
-  private BigDecimal expansionRate; //unit interval //10
-  private BigDecimal treasuryGrowthRate; //11
-  private BigDecimal decentralisationParam; //12
-  private ExtraEntropy extraEntropy; //13
   private ProtocolVersion protocolVersion; //14
-  @JsonProperty("minUTxOValue")
-  private BigInteger minUtxoValue; //15
 
   private BigInteger minPoolCost; //16
   private BigInteger adaPerUtxoByte; //17
 
   //Alonzo changes
   private Map<String, long[]> costModels; //18
-  private String costModelsHash;
-
-  //ex_unit_prices
-  private BigDecimal priceMem; //19
-  private BigDecimal priceStep; //19
-
-  //max tx ex units
-  private BigInteger maxTxExMem; //20
-  private BigInteger maxTxExSteps; //20
-
-  //max block ex units
-  private BigInteger maxBlockExMem; //21
-  private BigInteger maxBlockExSteps; //21
 
   private Long maxValSize; //22
-
-  private Integer collateralPercent; //23
   private Integer maxCollateralInputs; //24
 
-  //Conway era fields
-//    private PoolVotingThresholds poolVotingThresholds; //25
-//    private DrepVoteThresholds drepVotingThresholds; //26
-  private Integer committeeMinSize; //27
-  private Integer committeeMaxTermLength; //28
-  private Integer govActionLifetime; //29
-  private BigInteger govActionDeposit; //30
-  private BigInteger drepDeposit; //31
-  private Integer drepActivity; //32
-
   @Data
   public static class ExtraEntropy{
     String tag;

api/src/main/java/org/cardanofoundation/rosetta/api/block/model/entity/ProtocolParamsEntity.java

@@ -1,6 +1,5 @@
 package org.cardanofoundation.rosetta.api.block.model.entity;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Map;
 
@@ -12,7 +11,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.PropertyNamingStrategies;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 
@@ -28,52 +26,21 @@ public class ProtocolParamsEntity {
 
   private Integer minFeeA; //0
   private Integer minFeeB; //1
-  private Integer maxBlockSize; //2
   private Integer maxTxSize; //3
-  private Integer maxBlockHeaderSize; //4
   private BigInteger keyDeposit; //5
   private BigInteger poolDeposit; //6
-  private Integer maxEpoch; //7
-  @JsonProperty("nopt")
-  private Integer nOpt; //8
-  private BigDecimal poolPledgeInfluence; //rational //9
-  private BigDecimal expansionRate; //unit interval //10
-  private BigDecimal treasuryGrowthRate; //11
-  private BigDecimal decentralisationParam; //12
-  private String extraEntropy; //13
+
   private Integer protocolMajorVer; //14
   private Integer protocolMinorVer; //14
-  private BigInteger minUtxo; //15
 
   private BigInteger minPoolCost; //16
   private BigInteger adaPerUtxoByte; //17
 
   //Alonzo changes
   private Map<String, long[]> costModels; //18
-  private String costModelsHash;
-
-  //ex_unit_prices
-  private BigDecimal priceMem; //19
-  private BigDecimal priceStep; //19
-
-  //max tx ex units
-  private BigInteger maxTxExMem; //20
-  private BigInteger maxTxExSteps; //20
-
-  //max block ex units
-  private BigInteger maxBlockExMem; //21
-  private BigInteger maxBlockExSteps; //21
 
   private Long maxValSize; //22
 
-  private Integer collateralPercent; //23
   private Integer maxCollateralInputs; //24
 
-  private Integer committeeMinSize; //27
-  private Integer committeeMaxTermLength; //28
-  private Integer govActionLifetime; //29
-  private BigInteger govActionDeposit; //30
-  private BigInteger drepDeposit; //31
-  private Integer drepActivity; //32
-
 }

api/src/main/java/org/cardanofoundation/rosetta/common/mapper/ProtocolParamsToEntity.java

@@ -19,11 +19,8 @@ public ProtocolParams fromEntity(ProtocolParamsEntity entity){
     return modelMapper.typeMap(ProtocolParamsEntity.class, ProtocolParams.class)
         .implicitMappings()
         .addMappings(mapper -> {
-          mapper.<String>map(ProtocolParamsEntity::getExtraEntropy, (dest, v) -> dest.getExtraEntropy().setTag(v));
-          mapper.map(ProtocolParamsEntity::getMaxBlockSize, ProtocolParams::setMaxBlockBodySize);
           mapper.<Integer>map(ProtocolParamsEntity::getProtocolMajorVer, (dest, v) -> dest.getProtocolVersion().setMajor(v));
           mapper.<Integer>map(ProtocolParamsEntity::getProtocolMinorVer, (dest, v) -> dest.getProtocolVersion().setMinor(v));
-          mapper.map(ProtocolParamsEntity::getMinUtxo, ProtocolParams::setMinUtxoValue);
         })
         .map(entity);
   }

api/src/test/java/org/cardanofoundation/rosetta/common/mapper/ProtocolParamsToEntityTest.java

@@ -1,6 +1,5 @@
 package org.cardanofoundation.rosetta.common.mapper;
 
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Map;
 
@@ -38,24 +37,16 @@ void merge_Test_ok() {
     ProtocolParams from = ProtocolParams.builder()
         .costModels(Map.of("key3", new long[]{4}))
         .minPoolCost(BigInteger.valueOf(5))
-        .committeeMinSize(null)
-        .committeeMaxTermLength(6)
         .build();
     ProtocolParams to = ProtocolParams.builder()
-        .costModelsHash("costHash6")
         .minPoolCost(BigInteger.valueOf(7))
-        .committeeMinSize(8)
-        .committeeMaxTermLength(null)
         .build();
     ProtocolParams merged = my.merge(from, to);
 
     assertThat(merged.getCostModels()).hasSize(1);
     assertThat(merged.getCostModels().keySet()).containsAll(from.getCostModels().keySet());
     assertThat(merged.getCostModels().values()).containsAll(from.getCostModels().values());
     assertThat(merged.getMinPoolCost()).isEqualTo(from.getMinPoolCost());
-    assertThat(merged.getCommitteeMinSize()).isEqualTo(to.getCommitteeMinSize());
-    assertThat(merged.getCommitteeMaxTermLength()).isEqualTo(from.getCommitteeMaxTermLength());
-    assertThat(merged.getCostModelsHash()).isEqualTo(to.getCostModelsHash());
   }
 
   private EpochParamEntity newEpochParamEntity() {
@@ -65,81 +56,32 @@ private EpochParamEntity newEpochParamEntity() {
   private ProtocolParamsEntity newEpochParams() {
     return ProtocolParamsEntity
         .builder()
-        .decentralisationParam(BigDecimal.valueOf(1))
         .adaPerUtxoByte(BigInteger.valueOf(2))
-        .committeeMaxTermLength(3)
-        .committeeMinSize(4)
-        .drepDeposit(BigInteger.valueOf(5))
-        .collateralPercent(6)
-        .costModelsHash("costModelsHash7")
         .costModels(Map.of("key1", new long[]{0}))
-        .extraEntropy("extraEntropy8")
-        .expansionRate(BigDecimal.valueOf(9))
         .keyDeposit(BigInteger.valueOf(10))
-        .maxBlockExMem(BigInteger.valueOf(11))
-        .maxBlockHeaderSize(12)
-        .maxBlockExSteps(BigInteger.valueOf(13))
-        .maxBlockExMem(BigInteger.valueOf(14))
-        .maxBlockSize(15)
-        .maxEpoch(16)
-        .maxTxExMem(BigInteger.valueOf(17))
-        .maxTxExSteps(BigInteger.valueOf(18))
         .maxTxSize(19)
         .minFeeA(20)
         .minFeeB(21)
         .minPoolCost(BigInteger.valueOf(22))
-        .minUtxo(BigInteger.valueOf(23))
-        .nOpt(24)
         .poolDeposit(BigInteger.valueOf(25))
-        .poolPledgeInfluence(BigDecimal.valueOf(26))
-        .priceMem(BigDecimal.valueOf(27))
-        .priceStep(BigDecimal.valueOf(28))
         .protocolMajorVer(29)
         .protocolMinorVer(30)
-        .treasuryGrowthRate(BigDecimal.valueOf(31))
         .maxValSize(32L)
         .maxCollateralInputs(33)
-        .govActionDeposit(BigInteger.valueOf(34))
-        .govActionLifetime(35)
-        .drepActivity(36)
         .build();
   }
 
   private void assertProtocolParameters(ProtocolParams into, ProtocolParamsEntity param) {
-    assertThat(into.getDecentralisationParam()).isEqualTo(param.getDecentralisationParam());
     assertThat(into.getAdaPerUtxoByte()).isEqualTo(param.getAdaPerUtxoByte());
-    assertThat(into.getCommitteeMaxTermLength()).isEqualTo(param.getCommitteeMaxTermLength());
-    assertThat(into.getCommitteeMinSize()).isEqualTo(param.getCommitteeMinSize());
-    assertThat(into.getDrepDeposit()).isEqualTo(param.getDrepDeposit());
-    assertThat(into.getCollateralPercent()).isEqualTo(param.getCollateralPercent());
-    assertThat(into.getCostModelsHash()).isEqualTo(param.getCostModelsHash());
-    assertThat(into.getExtraEntropy().getTag()).isEqualTo(param.getExtraEntropy());
-    assertThat(into.getExpansionRate()).isEqualTo(param.getExpansionRate());
     assertThat(into.getKeyDeposit()).isEqualTo(param.getKeyDeposit());
-    assertThat(into.getMaxBlockHeaderSize()).isEqualTo(param.getMaxBlockHeaderSize());
-    assertThat(into.getMaxBlockBodySize()).isEqualTo(param.getMaxBlockSize());
-    assertThat(into.getMaxBlockExSteps()).isEqualTo(param.getMaxBlockExSteps());
-    assertThat(into.getMaxBlockExMem()).isEqualTo(param.getMaxBlockExMem());
-    assertThat(into.getMaxEpoch()).isEqualTo(param.getMaxEpoch());
-    assertThat(into.getMaxTxExMem()).isEqualTo(param.getMaxTxExMem());
-    assertThat(into.getMaxTxExSteps()).isEqualTo(param.getMaxTxExSteps());
     assertThat(into.getMaxTxSize()).isEqualTo(param.getMaxTxSize());
     assertThat(into.getMinFeeA()).isEqualTo(param.getMinFeeA());
     assertThat(into.getMinFeeB()).isEqualTo(param.getMinFeeB());
     assertThat(into.getMinPoolCost()).isEqualTo(param.getMinPoolCost());
-    assertThat(into.getMinUtxoValue()).isEqualTo(param.getMinUtxo());
-    assertThat(into.getNOpt()).isEqualTo(param.getNOpt());
     assertThat(into.getPoolDeposit()).isEqualTo(param.getPoolDeposit());
-    assertThat(into.getPoolPledgeInfluence()).isEqualTo(param.getPoolPledgeInfluence());
-    assertThat(into.getPriceMem()).isEqualTo(param.getPriceMem());
-    assertThat(into.getPriceStep()).isEqualTo(param.getPriceStep());
     assertThat(into.getProtocolVersion().getMajor()).isEqualTo(param.getProtocolMajorVer());
     assertThat(into.getProtocolVersion().getMinor()).isEqualTo(param.getProtocolMinorVer());
-    assertThat(into.getTreasuryGrowthRate()).isEqualTo(param.getTreasuryGrowthRate());
     assertThat(into.getMaxValSize()).isEqualTo(param.getMaxValSize());
     assertThat(into.getMaxCollateralInputs()).isEqualTo(param.getMaxCollateralInputs());
-    assertThat(into.getGovActionDeposit()).isEqualTo(param.getGovActionDeposit());
-    assertThat(into.getGovActionLifetime()).isEqualTo(param.getGovActionLifetime());
-    assertThat(into.getDrepActivity()).isEqualTo(param.getDrepActivity());
   }
 }