make types of rpc-api overridable

kalaninja · kalaninja · commit dc3ae72ce9e9 · 2022-06-11T11:06:40.000+07:00
diff --git a/api/src/test/java/com/strategyobject/substrateclient/api/ApiTests.java b/api/src/test/java/com/strategyobject/substrateclient/api/ApiTests.java
@@ -36,7 +36,7 @@ void getSystemPalletAndCall() throws Exception { // TODO move the test out of th
                     .get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
             assertNotNull(blockHash);
-            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getValue()));
         }
     }
 }
diff --git a/pallet/src/main/java/com/strategyobject/substrateclient/pallet/storage/StorageNMapImpl.java b/pallet/src/main/java/com/strategyobject/substrateclient/pallet/storage/StorageNMapImpl.java
@@ -3,8 +3,8 @@
 import com.strategyobject.substrateclient.common.types.tuple.Pair;
 import com.strategyobject.substrateclient.rpc.api.BlockHash;
 import com.strategyobject.substrateclient.rpc.api.Hash;
-import com.strategyobject.substrateclient.rpc.api.section.State;
 import com.strategyobject.substrateclient.rpc.api.StorageKey;
+import com.strategyobject.substrateclient.rpc.api.section.State;
 import com.strategyobject.substrateclient.scale.ScaleReader;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
diff --git a/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/IdentityTests.java b/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/IdentityTests.java
@@ -1,6 +1,7 @@
 package com.strategyobject.substrateclient.pallet.storage;
 
 import com.strategyobject.substrateclient.rpc.api.BlockHash;
+import com.strategyobject.substrateclient.rpc.api.impl.Hash256;
 import com.strategyobject.substrateclient.scale.ScaleWriter;
 import com.strategyobject.substrateclient.scale.registries.ScaleWriterRegistry;
 import lombok.SneakyThrows;
@@ -19,7 +20,7 @@ class IdentityTests {
     private static Stream<byte[]> getTestCasesForGetHash() {
         return Stream.of(
                 encode(Integer.class, -175),
-                encode(BlockHash.class, BlockHash.fromBytes(random(32))),
+                encode(BlockHash.class, Hash256.fromBytes(random(32))),
                 "TestString".getBytes(StandardCharsets.UTF_8),
                 random(new Random().nextInt(128) + 1));
     }
diff --git a/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/KeyHasherTests.java b/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/KeyHasherTests.java
@@ -4,6 +4,7 @@
 import com.strategyobject.substrateclient.crypto.ss58.SS58Codec;
 import com.strategyobject.substrateclient.rpc.api.AccountId;
 import com.strategyobject.substrateclient.rpc.api.BlockHash;
+import com.strategyobject.substrateclient.rpc.api.impl.Hash256;
 import com.strategyobject.substrateclient.scale.ScaleReader;
 import com.strategyobject.substrateclient.scale.ScaleWriter;
 import com.strategyobject.substrateclient.scale.readers.CompactIntegerReader;
@@ -44,7 +45,7 @@ private static Stream<Arguments> getTestCasesForGetHash() {
                         "0x4f9aea1afa791265fae359272badc1cf8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"
                 ),
                 Arguments.of(
-                        BlockHash.fromBytes(HexConverter.toBytes("0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")),
+                        Hash256.fromBytes(HexConverter.toBytes("0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")),
                         ScaleReaderRegistry.getInstance().resolve(BlockHash.class),
                         ScaleWriterRegistry.getInstance().resolve(BlockHash.class),
                         Identity.getInstance(),
@@ -115,7 +116,7 @@ private static Stream<Arguments> getTestCasesForExtractKey() {
                         ScaleReaderRegistry.getInstance().resolve(BlockHash.class),
                         ScaleWriterRegistry.getInstance().resolve(BlockHash.class),
                         Identity.getInstance(),
-                        BlockHash.fromBytes(HexConverter.toBytes("0xabcdef98765432100123456789abcdefabcdef98765432100123456789abcdef")),
+                        Hash256.fromBytes(HexConverter.toBytes("0xabcdef98765432100123456789abcdefabcdef98765432100123456789abcdef")),
                         0
                 ),
                 Arguments.of(
diff --git a/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/StorageMapImplTests.java b/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/StorageMapImplTests.java
@@ -46,7 +46,7 @@ void systemBlockHash() throws Exception {
 
             val actual = storage.get(0).get();
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(actual.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(actual.getValue()));
         }
     }
 }
diff --git a/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/StorageNMapImplTests.java b/pallet/src/test/java/com/strategyobject/substrateclient/pallet/storage/StorageNMapImplTests.java
@@ -86,7 +86,7 @@ void keys() throws Exception {
             assertEquals(1, list.size());
 
             val block = (BlockHash) list.stream().findFirst().orElseThrow(RuntimeException::new);
-            assertNotEquals(BigInteger.ZERO, new BigInteger(block.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(block.getValue()));
         }
     }
 
@@ -138,7 +138,7 @@ void entries() throws Exception {
             }));
 
             assertEquals(0, blockNumber.get());
-            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getValue()));
         }
     }
 
@@ -157,7 +157,7 @@ void multi() throws Exception {
             assertEquals(2, list.size());
 
             assertEquals(0, list.get(0).getValue0());
-            assertNotEquals(BigInteger.ZERO, new BigInteger(list.get(0).getValue1().getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(list.get(0).getValue1().getValue()));
 
             assertEquals(1, list.get(1).getValue0());
             assertNull(list.get(1).getValue1());
@@ -208,7 +208,7 @@ void entriesPaged() throws Exception {
             while (pages.moveNext().join()) {
                 pages.current().iterator().forEachRemaining(e -> e.consume((value, keys) -> {
                     val key = (Integer) keys.get(0);
-                    assertNotEquals(BigInteger.ZERO, new BigInteger(value.getData()));
+                    assertNotEquals(BigInteger.ZERO, new BigInteger(value.getValue()));
 
                     pairs.add(Pair.of(key, value));
                 }));
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockHash.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockHash.java
@@ -1,18 +1,4 @@
 package com.strategyobject.substrateclient.rpc.api;
 
-import com.strategyobject.substrateclient.common.types.FixedBytes;
-import com.strategyobject.substrateclient.common.types.Size;
-import com.strategyobject.substrateclient.scale.ScaleSelfWritable;
-import lombok.NonNull;
-
-public class BlockHash
-        extends FixedBytes<Size.Of32>
-        implements ScaleSelfWritable<BlockHash> {
-    protected BlockHash(byte[] data) {
-        super(data, Size.of32);
-    }
-
-    public static BlockHash fromBytes(byte @NonNull [] data) {
-        return new BlockHash(data);
-    }
+public interface BlockHash extends Hash {
 }
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockHashReader.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockHashReader.java
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockNumber.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockNumber.java
@@ -7,6 +7,6 @@
 
 @RequiredArgsConstructor(staticName = "of")
 @Getter
-public class Number {
+public class BlockNumber {
     private final BigInteger value;
 }
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockNumberDecoder.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/BlockNumberDecoder.java
@@ -8,13 +8,13 @@
 
 import java.math.BigInteger;
 
-@AutoRegister(types = Number.class)
-public class NumberDecoder extends AbstractDecoder<Number> {
+@AutoRegister(types = BlockNumber.class)
+public class BlockNumberDecoder extends AbstractDecoder<BlockNumber> {
     @Override
-    protected Number decodeNonNull(RpcObject value, DecoderPair<?>[] decoders) {
+    protected BlockNumber decodeNonNull(RpcObject value, DecoderPair<?>[] decoders) {
         val stringValue = value.asString();
         val number = new BigInteger(stringValue.substring(2), 16);
 
-        return Number.of(number);
+        return BlockNumber.of(number);
     }
 }
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/FixedBytesWriter.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/FixedBytesWriter.java
@@ -6,6 +6,7 @@
 import com.strategyobject.substrateclient.common.types.Size;
 import com.strategyobject.substrateclient.crypto.PublicKey;
 import com.strategyobject.substrateclient.crypto.SignatureData;
+import com.strategyobject.substrateclient.rpc.api.impl.Hash256;
 import com.strategyobject.substrateclient.scale.ScaleWriter;
 import com.strategyobject.substrateclient.scale.annotation.AutoRegister;
 import lombok.NonNull;
@@ -16,8 +17,9 @@
 @AutoRegister(
         types = {
                 AccountId.class,
-                BlockHash.class,
+                Hash256.class,
                 Hash.class,
+                BlockHash.class,
                 PublicKey.class,
                 SignatureData.class
         })
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/Hash.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/Hash.java
@@ -1,16 +1,5 @@
 package com.strategyobject.substrateclient.rpc.api;
 
-import com.strategyobject.substrateclient.common.types.FixedBytes;
-import com.strategyobject.substrateclient.common.types.Size;
-import com.strategyobject.substrateclient.scale.ScaleSelfWritable;
-import lombok.NonNull;
-
-public class Hash extends FixedBytes<Size.Of32> implements ScaleSelfWritable<Hash> {
-    private Hash(byte[] data) {
-        super(data, Size.of32);
-    }
-
-    public static Hash fromBytes(byte @NonNull [] data) {
-        return new Hash(data);
-    }
+public interface Hash {
+    byte[] getValue();
 }
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/Header.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/Header.java
@@ -12,6 +12,5 @@ public class Header { // TODO add rest fields
     @Scale
     private BlockHash parentHash;
 
-    private Number number; /* TODO probably it would be better to change the type to BigInteger
-                                and support specific decoders */
+    private BlockNumber number;
 }
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/impl/Hash256.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/impl/Hash256.java
@@ -0,0 +1,22 @@
+package com.strategyobject.substrateclient.rpc.api.impl;
+
+import com.strategyobject.substrateclient.common.types.FixedBytes;
+import com.strategyobject.substrateclient.common.types.Size;
+import com.strategyobject.substrateclient.rpc.api.BlockHash;
+import com.strategyobject.substrateclient.rpc.api.Hash;
+import lombok.NonNull;
+
+public class Hash256 extends FixedBytes<Size.Of32> implements Hash, BlockHash {
+    private Hash256(byte[] data) {
+        super(data, Size.of32);
+    }
+
+    @Override
+    public byte[] getValue() {
+        return getData();
+    }
+
+    public static Hash256 fromBytes(byte @NonNull [] data) {
+        return new Hash256(data);
+    }
+}
diff --git a/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/impl/Hash256Reader.java b/rpc/rpc-api/src/main/java/com/strategyobject/substrateclient/rpc/api/impl/Hash256Reader.java
@@ -1,21 +1,23 @@
-package com.strategyobject.substrateclient.rpc.api;
+package com.strategyobject.substrateclient.rpc.api.impl;
 
 import com.google.common.base.Preconditions;
 import com.strategyobject.substrateclient.common.io.Streamer;
 import com.strategyobject.substrateclient.common.types.Size;
+import com.strategyobject.substrateclient.rpc.api.BlockHash;
+import com.strategyobject.substrateclient.rpc.api.Hash;
 import com.strategyobject.substrateclient.scale.ScaleReader;
 import com.strategyobject.substrateclient.scale.annotation.AutoRegister;
 import lombok.NonNull;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-@AutoRegister(types = Hash.class)
-public class HashReader implements ScaleReader<Hash> {
+@AutoRegister(types = {Hash256.class, Hash.class, BlockHash.class})
+public class Hash256Reader implements ScaleReader<Hash> {
     @Override
     public Hash read(@NonNull InputStream stream, ScaleReader<?>... readers) throws IOException {
         Preconditions.checkArgument(readers == null || readers.length == 0);
 
-        return Hash.fromBytes(Streamer.readBytes(Size.of32.getValue(), stream));
+        return Hash256.fromBytes(Streamer.readBytes(Size.of32.getValue(), stream));
     }
 }
diff --git a/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/section/ChainTests.java b/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/section/ChainTests.java
@@ -2,7 +2,6 @@
 
 import com.strategyobject.substrateclient.rpc.RpcGeneratedSectionFactory;
 import com.strategyobject.substrateclient.rpc.api.BlockHash;
-import com.strategyobject.substrateclient.rpc.api.section.Chain;
 import com.strategyobject.substrateclient.tests.containers.SubstrateVersion;
 import com.strategyobject.substrateclient.tests.containers.TestSubstrateContainer;
 import com.strategyobject.substrateclient.transport.ws.WsProvider;
@@ -39,7 +38,7 @@ void getFinalizedHead() throws Exception {
             val chain = RpcGeneratedSectionFactory.create(Chain.class, wsProvider);
             val result = chain.getFinalizedHead().get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(result.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(result.getValue()));
         }
     }
 
@@ -63,7 +62,7 @@ void subscribeNewHeads() throws Exception {
                     .atMost(WAIT_TIMEOUT * 2, TimeUnit.SECONDS)
                     .untilAtomic(blockCount, greaterThan(2));
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getValue()));
 
             val result = unsubscribeFunc.get().get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
@@ -77,7 +76,7 @@ void getBlockHash() throws Exception {
             val chain = RpcGeneratedSectionFactory.create(Chain.class, wsProvider);
             val result = chain.getBlockHash(0).get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(result.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(result.getValue()));
         }
     }
 
@@ -100,11 +99,11 @@ void getBlock() throws Exception {
             val number = height.get();
             val blockHash = chain.getBlockHash(number).get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getValue()));
 
             val block = chain.getBlock(blockHash).get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
-            assertNotEquals(BigInteger.ZERO, new BigInteger(block.getBlock().getHeader().getParentHash().getData()));
+            assertNotEquals(BigInteger.ZERO, new BigInteger(block.getBlock().getHeader().getParentHash().getValue()));
             Assertions.assertEquals(number, block.getBlock().getHeader().getNumber().getValue().intValue());
         }
     }
diff --git a/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/section/StateTests.java b/rpc/rpc-api/src/test/java/com/strategyobject/substrateclient/rpc/api/section/StateTests.java
@@ -115,7 +115,7 @@ void getStorageHash() throws Exception {
             val hash = state.getStorageHash(storageKey).get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
             assertNotNull(hash);
-            assertTrue(hash.getData().length > 0);
+            assertTrue(hash.getValue().length > 0);
         }
     }
 
@@ -129,7 +129,7 @@ void getStorageHashAt() throws Exception {
             val hash = state.getStorageHash(storageKey, blockHash).get(WAIT_TIMEOUT, TimeUnit.SECONDS);
 
             assertNotNull(hash);
-            assertTrue(hash.getData().length > 0);
+            assertTrue(hash.getValue().length > 0);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void getSystemPalletAndCall() throws Exception { // TODO move the test out of th`
`36`	`36`	`.get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`37`	`37`
`38`	`38`	`assertNotNull(blockHash);`
`39`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getData()));`
	`39`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getValue()));`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ void systemBlockHash() throws Exception {`
`46`	`46`
`47`	`47`	`val actual = storage.get(0).get();`
`48`	`48`
`49`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(actual.getData()));`
	`49`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(actual.getValue()));`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`
`8`	`8`	`@RequiredArgsConstructor(staticName = "of")`
`9`	`9`	`@Getter`
`10`		`-public class Number {`
	`10`	`+public class BlockNumber {`
`11`	`11`	`private final BigInteger value;`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,5 @@ public class Header { // TODO add rest fields`
`12`	`12`	`@Scale`
`13`	`13`	`private BlockHash parentHash;`
`14`	`14`
`15`		`- private Number number; /* TODO probably it would be better to change the type to BigInteger`
`16`		`- and support specific decoders */`
	`15`	`+ private BlockNumber number;`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`import com.strategyobject.substrateclient.rpc.RpcGeneratedSectionFactory;`
`4`	`4`	`import com.strategyobject.substrateclient.rpc.api.BlockHash;`
`5`		`-import com.strategyobject.substrateclient.rpc.api.section.Chain;`
`6`	`5`	`import com.strategyobject.substrateclient.tests.containers.SubstrateVersion;`
`7`	`6`	`import com.strategyobject.substrateclient.tests.containers.TestSubstrateContainer;`
`8`	`7`	`import com.strategyobject.substrateclient.transport.ws.WsProvider;`
`@@ -39,7 +38,7 @@ void getFinalizedHead() throws Exception {`
`39`	`38`	`val chain = RpcGeneratedSectionFactory.create(Chain.class, wsProvider);`
`40`	`39`	`val result = chain.getFinalizedHead().get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`41`	`40`
`42`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(result.getData()));`
	`41`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(result.getValue()));`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`
`@@ -63,7 +62,7 @@ void subscribeNewHeads() throws Exception {`
`63`	`62`	`.atMost(WAIT_TIMEOUT * 2, TimeUnit.SECONDS)`
`64`	`63`	`.untilAtomic(blockCount, greaterThan(2));`
`65`	`64`
`66`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getData()));`
	`65`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.get().getValue()));`
`67`	`66`
`68`	`67`	`val result = unsubscribeFunc.get().get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`69`	`68`
`@@ -77,7 +76,7 @@ void getBlockHash() throws Exception {`
`77`	`76`	`val chain = RpcGeneratedSectionFactory.create(Chain.class, wsProvider);`
`78`	`77`	`val result = chain.getBlockHash(0).get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`79`	`78`
`80`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(result.getData()));`
	`79`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(result.getValue()));`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`
`@@ -100,11 +99,11 @@ void getBlock() throws Exception {`
`100`	`99`	`val number = height.get();`
`101`	`100`	`val blockHash = chain.getBlockHash(number).get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`102`	`101`
`103`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getData()));`
	`102`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(blockHash.getValue()));`
`104`	`103`
`105`	`104`	`val block = chain.getBlock(blockHash).get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`106`	`105`
`107`		`- assertNotEquals(BigInteger.ZERO, new BigInteger(block.getBlock().getHeader().getParentHash().getData()));`
	`106`	`+ assertNotEquals(BigInteger.ZERO, new BigInteger(block.getBlock().getHeader().getParentHash().getValue()));`
`108`	`107`	`Assertions.assertEquals(number, block.getBlock().getHeader().getNumber().getValue().intValue());`
`109`	`108`	`}`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ void getStorageHash() throws Exception {`
`115`	`115`	`val hash = state.getStorageHash(storageKey).get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`116`	`116`
`117`	`117`	`assertNotNull(hash);`
`118`		`- assertTrue(hash.getData().length > 0);`
	`118`	`+ assertTrue(hash.getValue().length > 0);`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`@@ -129,7 +129,7 @@ void getStorageHashAt() throws Exception {`
`129`	`129`	`val hash = state.getStorageHash(storageKey, blockHash).get(WAIT_TIMEOUT, TimeUnit.SECONDS);`
`130`	`130`
`131`	`131`	`assertNotNull(hash);`
`132`		`- assertTrue(hash.getData().length > 0);`
	`132`	`+ assertTrue(hash.getValue().length > 0);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`