From dcbbfd08aef8e54f387084eb1a3a9dd6ba22f21c Mon Sep 17 00:00:00 2001
From: jangko <jangko128@gmail.com>
Date: Mon, 9 Aug 2021 08:35:54 +0700
Subject: [PATCH] hive script: move HIVE_CLIQUE_PERIOD processing from
 nimbus.sh to mapper.jq

---
 hive_integration/nimbus/mapper.jq | 3 +++
 hive_integration/nimbus/nimbus.sh | 9 +++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hive_integration/nimbus/mapper.jq b/hive_integration/nimbus/mapper.jq
index fed3f4c49..fe03669dd 100644
--- a/hive_integration/nimbus/mapper.jq
+++ b/hive_integration/nimbus/mapper.jq
@@ -52,6 +52,9 @@ def to_bool:
     "baseFeePerGas": .baseFeePerGas
   }|remove_empty,
   "config": {
+    "clique": (if env.HIVE_CLIQUE_PERIOD == null then null else {
+      "period": env.HIVE_CLIQUE_PERIOD|to_int,
+    } end),
     "chainId": env.HIVE_CHAIN_ID|to_int,
     "homesteadBlock": env.HIVE_FORK_HOMESTEAD|to_int,
     "daoForkBlock": env.HIVE_FORK_DAO_BLOCK|to_int,
diff --git a/hive_integration/nimbus/nimbus.sh b/hive_integration/nimbus/nimbus.sh
index 61836f94d..bdd39be65 100644
--- a/hive_integration/nimbus/nimbus.sh
+++ b/hive_integration/nimbus/nimbus.sh
@@ -64,13 +64,10 @@ if [ "$HIVE_NETWORK_ID" != "" ]; then
   FLAGS="$FLAGS --networkid:$HIVE_NETWORK_ID"
 fi
 
-if [ "$HIVE_CLIQUE_PERIOD" != "" ]; then
-  FLAGS="$FLAGS --clique-period:$HIVE_CLIQUE_PERIOD"
-fi
-
 if [ "$HIVE_CLIQUE_PRIVATEKEY" != "" ]; then
-  echo "$HIVE_CLIQUE_PRIVATEKEY" > /private.key
-  FLAGS="$FLAGS --import-key:/private.key"
+# -n will prevent newline when echoing something
+  echo -n "$HIVE_CLIQUE_PRIVATEKEY" > private.key
+  FLAGS="$FLAGS --import-key:private.key"
 fi
 
 if [ "$HIVE_MINER" != "" ]; then