status-im/nimbus-eth2
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth2.git synced 2025-02-17 00:47:03 +00:00
Code Issues Projects Releases Wiki Activity

post-merge fixes

Browse Source
This commit is contained in:
Ștefan Talpalaru 2020-04-08 23:09:52 +02:00
parent b574799088
commit 96431bfd86
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AllTests-mainnet.md
View File

@ -58,6 +58,11 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
+ Mocked start private key OK + Mocked start private key OK
``` ```
OK: 3/3 Fail: 0/3 Skip: 0/3 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] ## Official - 0.11.1 - constants & config [Preset: mainnet]
```diff ```diff
+ BASE_REWARD_FACTOR 64 [Preset: mainnet] OK + 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 OK: 8/8 Fail: 0/8 Skip: 0/8
---TOTAL--- ---TOTAL---
OK: 144/147 Fail: 3/147 Skip: 0/147 OK: 145/148 Fail: 3/148 Skip: 0/148

7
AllTests-minimal.md
View File

@ -85,6 +85,11 @@ OK: 1/1 Fail: 0/1 Skip: 0/1
+ Mocked start private key OK + Mocked start private key OK
``` ```
OK: 3/3 Fail: 0/3 Skip: 0/3 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] ## Official - 0.11.1 - constants & config [Preset: minimal]
```diff ```diff
+ BASE_REWARD_FACTOR 64 [Preset: minimal] OK + 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 OK: 8/8 Fail: 0/8 Skip: 0/8
---TOTAL--- ---TOTAL---
OK: 159/162 Fail: 3/162 Skip: 0/162 OK: 160/163 Fail: 3/163 Skip: 0/163

3
beacon_chain/beacon_node.nim
View File

@ -967,10 +967,7 @@ proc installBeaconApiHandlers(rpcServer: RpcServer, node: BeaconNode) =
result.add $peerId result.add $peerId
rpcServer.rpc("getNetworkEnr") do () -> string: rpcServer.rpc("getNetworkEnr") do () -> string:
when networkBackend == libp2p:
return $node.network.discovery.localNode.record return $node.network.discovery.localNode.record
else:
return ""
proc installDebugApiHandlers(rpcServer: RpcServer, node: BeaconNode) = proc installDebugApiHandlers(rpcServer: RpcServer, node: BeaconNode) =
rpcServer.rpc("getSpecPreset") do () -> JsonNode: rpcServer.rpc("getSpecPreset") do () -> JsonNode:

4
docker/Makefile
View File

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