diff --git a/src/main/java/com/limechain/network/protocol/warp/WarpSyncProtocol.java b/src/main/java/com/limechain/network/protocol/warp/WarpSyncProtocol.java index 2c77fee93..eb11ebc8e 100644 --- a/src/main/java/com/limechain/network/protocol/warp/WarpSyncProtocol.java +++ b/src/main/java/com/limechain/network/protocol/warp/WarpSyncProtocol.java @@ -5,7 +5,7 @@ import com.limechain.network.protocol.warp.dto.WarpSyncRequest; import com.limechain.network.protocol.warp.dto.WarpSyncResponse; import com.limechain.network.protocol.warp.encoding.WarpSyncResponseDecoder; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.network.protocol.warp.scale.writer.WarpSyncRequestWriter; import io.emeraldpay.polkaj.scale.ScaleCodecWriter; import io.libp2p.core.Stream; diff --git a/src/main/java/com/limechain/network/protocol/warp/dto/BlockBody.java b/src/main/java/com/limechain/network/protocol/warp/dto/BlockBody.java index ad24ce5e0..2680e9fb8 100644 --- a/src/main/java/com/limechain/network/protocol/warp/dto/BlockBody.java +++ b/src/main/java/com/limechain/network/protocol/warp/dto/BlockBody.java @@ -1,6 +1,6 @@ package com.limechain.network.protocol.warp.dto; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.network.protocol.warp.scale.reader.BlockBodyReader; import com.limechain.network.protocol.warp.scale.writer.BlockBodyWriter; import com.limechain.utils.HashUtils; diff --git a/src/main/java/com/limechain/network/protocol/warp/dto/BlockHeader.java b/src/main/java/com/limechain/network/protocol/warp/dto/BlockHeader.java index 23736f742..9bdc3e3c4 100644 --- a/src/main/java/com/limechain/network/protocol/warp/dto/BlockHeader.java +++ b/src/main/java/com/limechain/network/protocol/warp/dto/BlockHeader.java @@ -1,7 +1,7 @@ package com.limechain.network.protocol.warp.dto; import com.limechain.network.protocol.blockannounce.scale.BlockHeaderScaleWriter; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.utils.HashUtils; import io.emeraldpay.polkaj.scale.ScaleCodecWriter; import io.emeraldpay.polkaj.types.Hash256; diff --git a/src/main/java/com/limechain/network/protocol/warp/dto/Extrinsics.java b/src/main/java/com/limechain/network/protocol/warp/dto/Extrinsics.java index d8116191b..4e5667828 100644 --- a/src/main/java/com/limechain/network/protocol/warp/dto/Extrinsics.java +++ b/src/main/java/com/limechain/network/protocol/warp/dto/Extrinsics.java @@ -1,6 +1,6 @@ package com.limechain.network.protocol.warp.dto; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.utils.HashUtils; import io.emeraldpay.polkaj.scale.ScaleCodecWriter; import lombok.Data; diff --git a/src/main/java/com/limechain/runtime/hostapi/CryptoHostFunctions.java b/src/main/java/com/limechain/runtime/hostapi/CryptoHostFunctions.java index 37f4c0fde..59f04f7ec 100644 --- a/src/main/java/com/limechain/runtime/hostapi/CryptoHostFunctions.java +++ b/src/main/java/com/limechain/runtime/hostapi/CryptoHostFunctions.java @@ -1,6 +1,6 @@ package com.limechain.runtime.hostapi; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.rpc.server.AppBean; import com.limechain.runtime.hostapi.dto.Key; import com.limechain.runtime.hostapi.dto.RuntimePointerSize; diff --git a/src/main/java/com/limechain/runtime/hostapi/StorageHostFunctions.java b/src/main/java/com/limechain/runtime/hostapi/StorageHostFunctions.java index 234ddf2f0..febc3d5fb 100644 --- a/src/main/java/com/limechain/runtime/hostapi/StorageHostFunctions.java +++ b/src/main/java/com/limechain/runtime/hostapi/StorageHostFunctions.java @@ -1,6 +1,6 @@ package com.limechain.runtime.hostapi; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.runtime.hostapi.dto.RuntimePointerSize; import com.limechain.storage.DBConstants; import com.limechain.storage.DeleteByPrefixResult; diff --git a/src/main/java/com/limechain/storage/DeleteByPrefixResult.java b/src/main/java/com/limechain/storage/DeleteByPrefixResult.java index ef65439f2..175493f8c 100644 --- a/src/main/java/com/limechain/storage/DeleteByPrefixResult.java +++ b/src/main/java/com/limechain/storage/DeleteByPrefixResult.java @@ -1,6 +1,6 @@ package com.limechain.storage; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import io.emeraldpay.polkaj.scale.ScaleCodecWriter; import java.io.ByteArrayOutputStream; diff --git a/src/main/java/com/limechain/storage/block/BlockStateHelper.java b/src/main/java/com/limechain/storage/block/BlockStateHelper.java index 338825502..c70a7aa26 100644 --- a/src/main/java/com/limechain/storage/block/BlockStateHelper.java +++ b/src/main/java/com/limechain/storage/block/BlockStateHelper.java @@ -2,7 +2,7 @@ import com.limechain.network.protocol.blockannounce.scale.BlockHeaderScaleWriter; import com.limechain.network.protocol.warp.dto.BlockHeader; -import com.limechain.network.protocol.warp.exception.ScaleEncodingException; +import com.limechain.utils.scale.exceptions.ScaleEncodingException; import com.limechain.network.protocol.warp.scale.reader.BlockHeaderReader; import com.limechain.storage.DBConstants; import io.emeraldpay.polkaj.scale.ScaleCodecReader; diff --git a/src/main/java/com/limechain/utils/scale/ScaleUtils.java b/src/main/java/com/limechain/utils/scale/ScaleUtils.java index 231e1d06b..692e52ebc 100644 --- a/src/main/java/com/limechain/utils/scale/ScaleUtils.java +++ b/src/main/java/com/limechain/utils/scale/ScaleUtils.java @@ -1,5 +1,6 @@ package com.limechain.utils.scale; +import com.limechain.utils.scale.exceptions.ScaleDecodingException; import com.limechain.utils.scale.writers.PairWriter; import io.emeraldpay.polkaj.scale.ScaleCodecReader; import io.emeraldpay.polkaj.scale.ScaleCodecWriter; @@ -15,7 +16,8 @@ import java.util.List; import java.util.function.Function; -// TODO: This class is currently just a helper utility class, +// TODO: +// This is currently a helper utility class // planned to grow into a unified scale encode/decode util class with whatever methods are useful // WIP // Currently trying out different approaches to spare some of the boilerplate around SCALE en/decoding @@ -28,7 +30,7 @@ public T decode(byte[] encodedData, ScaleReader reader) { try { return new ScaleCodecReader(encodedData).read(reader); } catch (RuntimeException e) { - throw new RuntimeException("Error while SCALE decoding.", e); // TODO: is this a code smell? + throw new ScaleDecodingException("Error while SCALE decoding.", e); } } diff --git a/src/main/java/com/limechain/utils/scale/exceptions/ScaleDecodingException.java b/src/main/java/com/limechain/utils/scale/exceptions/ScaleDecodingException.java new file mode 100644 index 000000000..b1e6ddfc2 --- /dev/null +++ b/src/main/java/com/limechain/utils/scale/exceptions/ScaleDecodingException.java @@ -0,0 +1,15 @@ +package com.limechain.utils.scale.exceptions; + +public class ScaleDecodingException extends RuntimeException { + public ScaleDecodingException(Throwable cause) { + super(cause); + } + + public ScaleDecodingException(String message) { + super(message); + } + + public ScaleDecodingException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/src/main/java/com/limechain/network/protocol/warp/exception/ScaleEncodingException.java b/src/main/java/com/limechain/utils/scale/exceptions/ScaleEncodingException.java similarity index 85% rename from src/main/java/com/limechain/network/protocol/warp/exception/ScaleEncodingException.java rename to src/main/java/com/limechain/utils/scale/exceptions/ScaleEncodingException.java index 82f310e29..bb9889b36 100644 --- a/src/main/java/com/limechain/network/protocol/warp/exception/ScaleEncodingException.java +++ b/src/main/java/com/limechain/utils/scale/exceptions/ScaleEncodingException.java @@ -1,4 +1,4 @@ -package com.limechain.network.protocol.warp.exception; +package com.limechain.utils.scale.exceptions; public class ScaleEncodingException extends RuntimeException{ public ScaleEncodingException(Throwable cause) {