updated tests to ensure hex values are returned (hyperledger#3564)

Signed-off-by: Justin Florentine <justin+github@florentine.us> Co-authored-by: Sally MacFarlane <sally.macfarlane@consensys.net>
frankisawesome · Mar 16, 2022 · 6e595c1 · 6e595c1
1 parent 3f6a1ce
commit 6e595c1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 10 deletions.
diff --git a/...su/ethereum/api/jsonrpc/internal/results/EngineExchangeTransitionConfigurationResult.java b/...su/ethereum/api/jsonrpc/internal/results/EngineExchangeTransitionConfigurationResult.java
@@ -17,8 +17,6 @@
 import org.hyperledger.besu.datatypes.Hash;
 import org.hyperledger.besu.ethereum.core.Difficulty;
 
-import java.util.Optional;
-
 import com.fasterxml.jackson.annotation.JsonGetter;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
@@ -39,7 +37,7 @@ public EngineExchangeTransitionConfigurationResult(
 
  @JsonGetter(value = "terminalTotalDifficulty")
  public String getTerminalTotalDifficultyAsString() {
- return terminalTotalDifficulty.toHexString();
+ return Quantity.create(this.terminalTotalDifficulty.getAsBigInteger());
  }
 
  public Difficulty getTerminalTotalDifficulty() {
@@ -57,10 +55,7 @@ public Hash getTerminalBlockHash() {
 
  @JsonGetter(value = "terminalBlockNumber")
  public String getTerminalBlockNumberAsString() {
- return Optional.of(terminalBlockNumber)
- .filter(val -> val != 0L)
- .map(Long::toHexString)
- .orElse("0x0");
+ return Quantity.create(this.terminalBlockNumber);
  }
 
  public Long getTerminalBlockNumber() {

diff --git a/...hereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java b/...hereum/api/jsonrpc/internal/methods/engine/EngineExchangeTransitionConfigurationTest.java
@@ -159,17 +159,33 @@ public void shouldAlwaysReturnResultsInHex() throws JsonProcessingException {
  new EngineExchangeTransitionConfigurationResult(Difficulty.ZERO, Hash.ZERO, 0L);
 
  assertThat(mockResult.getTerminalBlockNumberAsString()).isEqualTo("0x0");
- assertThat(mockResult.getTerminalTotalDifficultyAsString())
- .isEqualTo(Difficulty.ZERO.toHexString());
+ assertThat(mockResult.getTerminalTotalDifficultyAsString()).isEqualTo("0x0");
  assertThat(mockResult.getTerminalBlockHashAsString()).isEqualTo(Hash.ZERO.toHexString());
 
  String json = mapper.writeValueAsString(mockResult);
  var res = mapper.readValue(json, Map.class);
  assertThat(res.get("terminalBlockNumber")).isEqualTo("0x0");
  assertThat(res.get("terminalBlockHash"))
  .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000000");
- assertThat(res.get("terminalTotalDifficulty"))
+ assertThat(res.get("terminalTotalDifficulty")).isEqualTo("0x0");
+ }
+
+ @Test
+ public void shouldStripLeadingZeros() throws JsonProcessingException {
+ var mapper = new ObjectMapper();
+ var mockResult =
+ new EngineExchangeTransitionConfigurationResult(Difficulty.ZERO, Hash.ZERO, 100);
+
+ assertThat(mockResult.getTerminalBlockNumberAsString()).isEqualTo("0x64");
+ assertThat(mockResult.getTerminalTotalDifficultyAsString()).isEqualTo("0x0");
+ assertThat(mockResult.getTerminalBlockHashAsString()).isEqualTo(Hash.ZERO.toHexString());
+
+ String json = mapper.writeValueAsString(mockResult);
+ var res = mapper.readValue(json, Map.class);
+ assertThat(res.get("terminalBlockNumber")).isEqualTo("0x64");
+ assertThat(res.get("terminalBlockHash"))
  .isEqualTo("0x0000000000000000000000000000000000000000000000000000000000000000");
+ assertThat(res.get("terminalTotalDifficulty")).isEqualTo("0x0");
  }
 
  @Test