Add voting power, award to chaininfo

aergoio · Nov 27, 2019 · d8d03aa · d8d03aa
1 parent 915b723
commit d8d03aa
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/...rc/test/java/hera/it/SmartContractIT.java → .../src/test/java/hera/it/ContractApiIT.java b/...rc/test/java/hera/it/SmartContractIT.java → .../src/test/java/hera/it/ContractApiIT.java
@@ -27,7 +27,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class SmartContractIT extends AbstractIT {
+public class ContractApiIT extends AbstractIT {
 
   protected WalletApi walletApi;
 

diff --git a/...resources/hera/it/SmartContractIT.payload → ...t/resources/hera/it/ContractApiIT.payload b/...resources/hera/it/SmartContractIT.payload → ...t/resources/hera/it/ContractApiIT.payload
diff --git a/core/common/src/main/java/hera/api/model/ChainInfo.java b/core/common/src/main/java/hera/api/model/ChainInfo.java
@@ -27,22 +27,29 @@ public class ChainInfo {
 
   @NonNull
   @Default
-  Aer totalTokenAmount = Aer.EMPTY;
+  Aer totalTokenAmount = Aer.ZERO;
 
   @NonNull
   @Default
-  Aer minimumStakingAmount = Aer.EMPTY;
+  Aer minimumStakingAmount = Aer.ZERO;
 
   @NonNull
   @Default
-  Aer totalStaked = Aer.EMPTY;
+  Aer totalStaked = Aer.ZERO;
 
   @NonNull
   @Default
-  Aer gasPrice = Aer.EMPTY;
+  Aer gasPrice = Aer.ZERO;
 
   @NonNull
   @Default
-  Aer namingPrice = Aer.EMPTY;
+  Aer namingPrice = Aer.ZERO;
 
+  @NonNull
+  @Default
+  Aer totalVotingPower = Aer.ZERO;
+
+  @NonNull
+  @Default
+  Aer votingReward = Aer.ZERO;
 }
diff --git a/core/protobuf/src/main b/core/protobuf/src/main
diff --git a/core/transport/src/main/java/hera/transport/ChainInfoConverterFactory.java b/core/transport/src/main/java/hera/transport/ChainInfoConverterFactory.java
@@ -50,6 +50,8 @@ public ChainInfo apply(final Rpc.ChainInfo rpcChainInfo) {
               .totalStaked(parseToAer(rpcChainInfo.getTotalstaking()))
               .gasPrice(parseToAer(rpcChainInfo.getGasprice()))
               .namingPrice(parseToAer(rpcChainInfo.getNameprice()))
+              .totalVotingPower(parseToAer(rpcChainInfo.getTotalvotingpower()))
+              .votingReward(parseToAer(rpcChainInfo.getVotingreward()))
               .build();
           logger.trace("Domain chain info converted: {}", domainChainInfo);
           return domainChainInfo;

diff --git a/test/aergo.properties b/test/aergo.properties
@@ -1,7 +1,7 @@
 # mega config (node version)
 # versions must separated by space (1.3.1 2.0.0 2.1.0)
-defaultAergoVersion=2.0.1
-aergoVersions=2.0.1
+defaultAergoVersion=2.0.2
+aergoVersions=2.0.2
 
 # aergo config
 aergoNodeName=aergo.node