From 8c2a524773a4584f857e5000a9eff8f9b8f389c4 Mon Sep 17 00:00:00 2001
From: rusefillc <sdfsdfqsf2334234234>
Date: Thu, 27 Oct 2022 21:58:07 -0400
Subject: [PATCH] making variable names just a bit less specific

---
 .../src/main/java/com/rusefi/ConfigDefinition.java   |  6 +++---
 .../src/main/java/com/rusefi/IoUtil2.java            | 11 -----------
 .../java/com/rusefi/output/SignatureConsumer.java    | 12 ++++++++++++
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
index 2de67c926c..4a38976f34 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/ConfigDefinition.java
@@ -175,8 +175,8 @@ public class ConfigDefinition {
 
         ParseState parseState = new ParseState(state.enumsReader);
         // Add the variable for the config signature
-        long crc32 = IoUtil2.getCrc32(state.inputFiles);
-        IoUtil2.signatureHash(state, parseState, tsInputFileFolder, crc32);
+        long uniqueId = IoUtil2.getCrc32(state.inputFiles);
+        SignatureConsumer.storeUniqueBuildId(state, parseState, tsInputFileFolder, uniqueId);
 
         ExtraUtil.handleFiringOrder(firingEnumFileName, state.variableRegistry, parseState);
 
@@ -227,7 +227,7 @@ public class ConfigDefinition {
 
             VariableRegistry tmpRegistry = new VariableRegistry();
             // store the CRC32 as a built-in variable
-            tmpRegistry.register(SIGNATURE_HASH, "" + crc32);
+            tmpRegistry.register(SIGNATURE_HASH, "" + uniqueId);
             tmpRegistry.readPrependValues(signaturePrependFile);
             state.destinations.add(new SignatureConsumer(signatureDestination, tmpRegistry));
         }
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java b/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java
index ebec31d1b0..727877fb22 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/IoUtil2.java
@@ -1,7 +1,5 @@
 package com.rusefi;
 
-import com.rusefi.newparse.ParseState;
-import com.rusefi.newparse.parsing.Definition;
 import com.rusefi.util.SystemOut;
 
 import java.io.BufferedReader;
@@ -59,13 +57,4 @@ public class IoUtil2 {
         return crc32;
     }
 
-    static void signatureHash(ReaderState state, ParseState parseState, String tsPath, long crc32) {
-        // store the CRC32 as a built-in variable
-
-        // nasty trick - do not insert signature into live data files
-        if (tsPath != null) {
-            parseState.addDefinition(state.variableRegistry,
-                    ConfigDefinition.SIGNATURE_HASH, Long.toString(crc32), Definition.OverwritePolicy.NotAllowed);
-        }
-    }
 }
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java
index 3542414bec..f05e4ebd56 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/SignatureConsumer.java
@@ -1,6 +1,8 @@
 package com.rusefi.output;
 
 import com.rusefi.*;
+import com.rusefi.newparse.ParseState;
+import com.rusefi.newparse.parsing.Definition;
 import com.rusefi.util.SystemOut;
 
 import java.io.IOException;
@@ -18,6 +20,16 @@ public class SignatureConsumer implements ConfigurationConsumer {
         this.registry = registry;
     }
 
+    public static void storeUniqueBuildId(ReaderState state, ParseState parseState, String tsPath, long uniqueId) {
+        // store a hash as a built-in variable
+
+        // nasty trick - do not insert signature into live data files
+        if (tsPath != null) {
+            parseState.addDefinition(state.variableRegistry,
+                    ConfigDefinition.SIGNATURE_HASH, Long.toString(uniqueId), Definition.OverwritePolicy.NotAllowed);
+        }
+    }
+
     @Override
     public void handleEndStruct(ReaderState readerState, ConfigStructure structure) throws IOException {
         ExtraUtil.writeDefinesToFile(registry, destHeader, "by SignatureConsumer");