post-merge fixes

status-im · Apr 8, 2020 · 96431bf · 96431bf
1 parent b574799
commit 96431bf
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/AllTests-mainnet.md b/AllTests-mainnet.md
@@ -58,6 +58,11 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
 + Mocked start private key                                                                   OK
 ```
 OK: 3/3 Fail: 0/3 Skip: 0/3
+## Mocking utilities
+```diff
++ merkle_minimal                                                                             OK
+```
+OK: 1/1 Fail: 0/1 Skip: 0/1
 ## Official - 0.11.1 - constants & config  [Preset: mainnet]
 ```diff
 + BASE_REWARD_FACTOR                                64                   [Preset: mainnet]   OK
@@ -229,4 +234,4 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
 OK: 8/8 Fail: 0/8 Skip: 0/8
 
 ---TOTAL---
-OK: 144/147 Fail: 3/147 Skip: 0/147
+OK: 145/148 Fail: 3/148 Skip: 0/148
diff --git a/AllTests-minimal.md b/AllTests-minimal.md
@@ -85,6 +85,11 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
 + Mocked start private key                                                                   OK
 ```
 OK: 3/3 Fail: 0/3 Skip: 0/3
+## Mocking utilities
+```diff
++ merkle_minimal                                                                             OK
+```
+OK: 1/1 Fail: 0/1 Skip: 0/1
 ## Official - 0.11.1 - constants & config  [Preset: minimal]
 ```diff
 + BASE_REWARD_FACTOR                                64                   [Preset: minimal]   OK
@@ -256,4 +261,4 @@ OK: 4/4 Fail: 0/4 Skip: 0/4
 OK: 8/8 Fail: 0/8 Skip: 0/8
 
 ---TOTAL---
-OK: 159/162 Fail: 3/162 Skip: 0/162
+OK: 160/163 Fail: 3/163 Skip: 0/163
diff --git a/beacon_chain/beacon_node.nim b/beacon_chain/beacon_node.nim
@@ -967,10 +967,7 @@ proc installBeaconApiHandlers(rpcServer: RpcServer, node: BeaconNode) =
       result.add $peerId
 
   rpcServer.rpc("getNetworkEnr") do () -> string:
-    when networkBackend == libp2p:
-      return $node.network.discovery.localNode.record
-    else:
-      return ""
+    return $node.network.discovery.localNode.record
 
 proc installDebugApiHandlers(rpcServer: RpcServer, node: BeaconNode) =
   rpcServer.rpc("getSpecPreset") do () -> JsonNode:

diff --git a/docker/Makefile b/docker/Makefile
@@ -30,7 +30,7 @@ push: build
 	+@ $(MAKE) push-last
 
 push-last:
-	# @ [[ "$(CURRENT_BRANCH)" != "master" && "$(NETWORK)" == "testnet0" ]] && $(COMPUTER_SAYS_NO) || true
-	# @ [[ "$(CURRENT_BRANCH)" != "devel" && "$(NETWORK)" == "testnet1" ]] && $(COMPUTER_SAYS_NO) || true
+	@ [[ "$(CURRENT_BRANCH)" != "master" && "$(NETWORK)" == "testnet0" ]] && $(COMPUTER_SAYS_NO) || true
+	@ [[ "$(CURRENT_BRANCH)" != "devel" && "$(NETWORK)" == "testnet1" ]] && $(COMPUTER_SAYS_NO) || true
 	docker push $(IMAGE_NAME)