Merge branch 'develop' into publish_prototype

Extending node.rep_weight test to account for changes in the recent rep crawler cleanup
nanocurrency · Jan 21, 2020 · 7d83472 · 7d83472
2 parents 8bd83e4 + e9aae5c
commit 7d83472
Show file tree

Hide file tree

Showing 96 changed files with 4,159 additions and 2,065 deletions.
diff --git a/.github/workflows/beta_artifacts.yml b/.github/workflows/beta_artifacts.yml
@@ -16,7 +16,7 @@ jobs:
       BOOST_ROOT: /tmp/boost
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
       - name: Checkout Submodules
@@ -36,7 +36,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
       - name: Checkout Submodules
@@ -60,7 +60,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: |
           $TRAVIS_TAG=git describe --tags $GITHUB_SHA

diff --git a/.github/workflows/live_artifacts.yml b/.github/workflows/live_artifacts.yml
@@ -15,7 +15,7 @@ jobs:
       BOOST_ROOT: /tmp/boost
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
       - name: Checkout Submodules
@@ -35,7 +35,7 @@ jobs:
     runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: echo "::set-env name=TAG::`git describe --tags $GITHUB_SHA`"
       - name: Checkout Submodules
@@ -59,7 +59,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@722adc6
-      - uses: chrislennon/action-aws-cli@1347f1d
+      - uses: chrislennon/action-aws-cli@f0f8671
       - name: tag
         run: |
           $TRAVIS_TAG=git describe --tags $GITHUB_SHA

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -20,6 +20,22 @@ jobs:
       - name: Run Tests
         run: ci/build-travis.sh "/tmp/qt/lib/cmake/Qt5";
 
+  clang_format:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@50fbc62
+      - name: Get clang-format 8
+        env: 
+          DEBIAN_FRONTEND: noninteractive
+        run: |
+          APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - 
+          sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main' -y
+          sudo apt update -y
+          sudo apt install -y clang-format-8
+          sudo ln -s /usr/bin/clang-format-8 /usr/bin/clang-format
+      - name: Clang Format
+        run: ci/check-commit-format.sh 
+
   gcc_test:
     runs-on: ubuntu-18.04
     steps:

diff --git a/ci/check-commit-format.sh b/ci/check-commit-format.sh
@@ -10,4 +10,7 @@ if [ "$RESULT" != "no modified files to format" ] && [ "$RESULT" != "clang-forma
     echo
     echo "Code formatting differs from expected - please run ci/clang-format-all.sh"
     exit 1
+else
+    echo "clang-format passed"
+    exit 0
 fi
diff --git a/nano/core_test/CMakeLists.txt b/nano/core_test/CMakeLists.txt
@@ -1,11 +1,14 @@
 add_executable (core_test
 	core_test_main.cc
 	testutil.hpp
+	fakes/work_peer.hpp
 	active_transactions.cpp
 	block.cpp
 	block_store.cpp
 	bootstrap.cpp
+	cli.cpp
 	confirmation_height.cpp
+	confirmation_solicitor.cpp
 	conflicts.cpp
 	difficulty.cpp
 	distributed_work.cpp
@@ -23,6 +26,7 @@ add_executable (core_test
 	memory_pool.cpp
 	processor_service.cpp
 	peer_container.cpp
+	request_aggregator.cpp
 	signing.cpp
 	socket.cpp
 	toml.cpp