fix: Remove ProtocolConfigV0

radixdlt · Jan 23, 2024 · 7476582 · 7476582
1 parent 20afd23
commit 7476582
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 91 deletions.
diff --git a/core-rust-bridge/src/main/java/com/radixdlt/protocol/ProtocolConfig.java b/core-rust-bridge/src/main/java/com/radixdlt/protocol/ProtocolConfig.java
@@ -96,13 +96,11 @@ public static void registerCodec(CodecMap codecMap) {
         codecs -> StructCodec.fromRecordComponents(ProtocolConfig.class, codecs));
   }
 
-  public static ProtocolConfig sborDecodeWithFallbackForOldVersions(byte[] encoded) {
+  public static ProtocolConfig sborDecode(byte[] encoded, String errorMessage) {
     try {
       return NodeSborCodecs.decode(encoded, NodeSborCodecs.resolveCodec(new TypeToken<>() {}));
     } catch (SborDecodeException ex) {
-      return NodeSborCodecs.decode(
-              encoded, NodeSborCodecs.resolveCodec(new TypeToken<ProtocolConfigV0>() {}))
-          .update();
+      throw new RuntimeException(errorMessage, ex);
     }
   }
 

diff --git a/core-rust-bridge/src/main/java/com/radixdlt/protocol/ProtocolConfigV0.java b/core-rust-bridge/src/main/java/com/radixdlt/protocol/ProtocolConfigV0.java
diff --git a/core/src/main/java/com/radixdlt/RadixNodeModule.java b/core/src/main/java/com/radixdlt/RadixNodeModule.java
@@ -360,7 +360,9 @@ protected void configure() {
     final ProtocolConfig protocolConfig;
     if (!customProtocolConfig.isEmpty()) {
       protocolConfig =
-          ProtocolConfig.sborDecodeWithFallbackForOldVersions(Hex.decode(customProtocolConfig));
+          ProtocolConfig.sborDecode(
+              Hex.decode(customProtocolConfig),
+              "Could not decode protocol custom_config. It may need regenerating.");
     } else {
       protocolConfig = ProtocolConfig.resolveForNetwork(NetworkDefinition.from(network));
     }