chore: simplify node configuration

aeternity · Jun 8, 2021 · 315f5ae · 315f5ae
1 parent daef543
commit 315f5ae
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -10,12 +10,18 @@ jobs:
 
     - uses: actions/checkout@v2
 
-    - run: |
+    - name: Lint
+      run: |
         go get -u golang.org/x/lint/golint
         make lint
 
     - run: make test-unit
     - run: docker-compose up -d
+    - name: Ensure that node is running
+      run: |
+        while [[ `curl -s -o /dev/null -w %{http_code} localhost:3013/api` != 200 ]]; do
+          sleep 0.2;
+        done
     - run: make test-integration
 
     - name: Build

diff --git a/build/docker/entrypoint.sh b/build/docker/entrypoint.sh
diff --git a/build/docker/keys/node/peer_key b/build/docker/keys/node/peer_key
diff --git a/build/docker/keys/node/peer_key.pub b/build/docker/keys/node/peer_key.pub
diff --git a/build/docker/keys/node/sign_key b/build/docker/keys/node/sign_key
diff --git a/build/docker/keys/node/sign_key.pub b/build/docker/keys/node/sign_key.pub
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,17 +8,12 @@ services:
       - "3113:3113"
     environment:
       AETERNITY_CONFIG: /home/aeternity/aeternity.yaml
-    command: bin/aeternity console -noinput -aecore expected_mine_rate ${AETERNITY_MINE_RATE:-15000}
+    command: bin/aeternity console -noinput -aecore
     volumes:
-      - ${PWD}/build/docker/aeternity_node_mean16.yaml:/home/aeternity/aeternity.yaml
-      - ${PWD}/build/docker/accounts.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
-      - ${PWD}/build/docker/keys/node:/home/aeternity/node/keys
-      - node_db:/home/aeternity/node/data/mnesia
+      - ${PWD}/docker/aeternity_node_mean16.yaml:/home/aeternity/aeternity.yaml
+      - ${PWD}/docker/accounts.json:/home/aeternity/node/data/aecore/.genesis/accounts_test.json
   compiler:
     image: aeternity/aesophia_http:${COMPILER_TAG}
     hostname: compiler
     ports:
       - "3080:3080"
-volumes:
-  node_db:
-  node_keys:
diff --git a/build/docker/accounts.json → docker/accounts.json b/build/docker/accounts.json → docker/accounts.json
diff --git a/build/docker/aeternity_node_mean16.yaml → docker/aeternity_node_mean16.yaml b/build/docker/aeternity_node_mean16.yaml → docker/aeternity_node_mean16.yaml
@@ -21,9 +21,7 @@ chain:
   persist: false
   hard_forks:
     "1": 0
-    "2": 2
-    "3": 4
-    "4": 6
+    "4": 1
 
 mining:
   autostart: true
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,9 +21,7 @@ chain: @@
       persist: false
       hard_forks:
         "1": 0
-        "2": 2
-        "3": 4
-        "4": 6
+        "4": 1
     mining:
       autostart: true
@@ Expand Down @@