update to v0.2.2 (#3)

* update from cryptogarageinc v0.2.4 + CI * fix: docker image name Co-authored-by: k-matsuzawa <[email protected]>
p2pderivatives · Nov 21, 2020 · 5c3776b · 5c3776b
1 parent b8ec6e6
commit 5c3776b
Show file tree

Hide file tree

Showing 32 changed files with 2,736 additions and 118 deletions.
diff --git a/.github/workflows/check_pre-merge_develop.yml b/.github/workflows/check_pre-merge_develop.yml
@@ -13,6 +13,12 @@ on:
     - develop
     - test_ci
 
+env:
+  GITHUB_VERSION: v0.0.5
+  DOCKER_PYTHON_VERSION: 3.7
+  GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
+  ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
+
 jobs:
   build-and-test:
     name: build & test
@@ -21,10 +27,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        py-ver: [3.6, 3.7, 3.8, pypy3]
+        os: [macos-10.15, windows-2019, ubuntu-18.04]
+        py-ver: [3.6, 3.7, 3.8, 3.9, pypy3]
         exclude:
-          - os: windows-latest
+          - os: windows-2019
             py-ver: pypy3
 
     steps:
@@ -53,14 +59,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        py-ver: [3.6, 3.7, 3.8, pypy3]
+        os: [macos-10.15, macos-11.0, windows-2019, ubuntu-18.04, ubuntu-20.04]
+        py-ver: [3.6, 3.7, 3.8, 3.9, pypy3]
         exclude:
-          - os: windows-latest
+          - os: windows-2019
             py-ver: 3.6
-          - os: windows-latest
+          - os: windows-2019
             py-ver: 3.7
-          - os: windows-latest
+          - os: windows-2019
+            py-ver: pypy3
+          - os: macos-11.0
             py-ver: pypy3
 
     steps:
@@ -80,9 +88,32 @@ jobs:
     - name: call example
       run: python ./tools/example.py
 
+  e2e-test:
+    timeout-minutes: 20
+    name: e2e-test
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ env.DOCKER_PYTHON_VERSION }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: install pip
+      run: python -m pip install -U pip
+    - name: create wheel
+      run: pip wheel .
+    - name: e2e-test
+      run: |
+        docker login docker.pkg.github.com -u owner -p ${{ secrets.GITHUB_TOKEN }}
+        docker pull ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+        docker run -v ${{ github.workspace }}:/github/workspace --entrypoint ${{ env.ENTRYPOINT_PATH }} ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+
   doxygen-ubuntu:
     name: doxygen-ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: install_doxygen

diff --git a/.github/workflows/check_pre-merge_master.yml b/.github/workflows/check_pre-merge_master.yml
@@ -4,10 +4,19 @@ on:
   push:
     branches:
     - master
+    paths-ignore:
+    - '.github/workflows/create_release-and-upload.yml'
+    - 'README.md'
   pull_request:
     branches:
     - master
 
+env:
+  GITHUB_VERSION: v0.0.5
+  DOCKER_PYTHON_VERSION: 3.7
+  GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
+  ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
+
 jobs:
   build-and-test:
     name: build & test
@@ -16,10 +25,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        py-ver: [3.6, 3.7, 3.8, pypy3]
+        os: [macos-10.15, windows-2019, ubuntu-18.04]
+        py-ver: [3.6, 3.7, 3.8, 3.9, pypy3]
         exclude:
-          - os: windows-latest
+          - os: windows-2019
             py-ver: pypy3
 
     steps:
@@ -48,14 +57,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        py-ver: [3.6, 3.7, 3.8, pypy3]
+        os: [macos-10.15, macos-11.0, windows-2019, ubuntu-18.04, ubuntu-20.04]
+        py-ver: [3.6, 3.7, 3.8, 3.9, pypy3]
         exclude:
-          - os: windows-latest
+          - os: windows-2019
             py-ver: 3.6
-          - os: windows-latest
+          - os: windows-2019
             py-ver: 3.7
-          - os: windows-latest
+          - os: windows-2019
+            py-ver: pypy3
+          - os: macos-11.0
             py-ver: pypy3
 
     steps:
@@ -75,9 +86,32 @@ jobs:
     - name: call example
       run: python ./tools/example.py
 
+  e2e-test:
+    timeout-minutes: 20
+    name: e2e-test
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ env.DOCKER_PYTHON_VERSION }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: install pip
+      run: python -m pip install -U pip
+    - name: create wheel
+      run: pip wheel .
+    - name: e2e-test
+      run: |
+        docker login docker.pkg.github.com -u owner -p ${{ secrets.GITHUB_TOKEN }}
+        docker pull ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+        docker run -v ${{ github.workspace }}:/github/workspace --entrypoint ${{ env.ENTRYPOINT_PATH }} ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+
   doxygen-ubuntu:
     name: doxygen-ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: install_doxygen

diff --git a/.github/workflows/check_pre-merge_sprint.yml b/.github/workflows/check_pre-merge_sprint.yml
@@ -11,6 +11,12 @@ on:
     branches:
     - features/sprint*
 
+env:
+  GITHUB_VERSION: v0.0.5
+  DOCKER_PYTHON_VERSION: 3.7
+  GITHUB_DOCKER_IMAGE: docker.pkg.github.com/cryptogarageinc/elements-testing-dockerfile/elements-testing
+  ENTRYPOINT_PATH: /github/workspace/.github/workflows/docker/test_entrypoint.sh
+
 jobs:
   build-and-test:
     name: build & test
@@ -19,16 +25,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        py-ver: [3.6, 3.7, 3.8, pypy3]
+        os: [macos-10.15, windows-2019, ubuntu-18.04]
+        py-ver: [3.6, 3.7, 3.8, 3.9, pypy3]
         exclude:
-          - os: macos-latest
+          - os: macos-10.15
             py-ver: 3.6
-          - os: macos-latest
+          - os: macos-10.15
             py-ver: 3.7
-          - os: windows-latest
+          - os: macos-10.15
+            py-ver: 3.8
+          - os: windows-2019
             py-ver: 3.6
-          - os: windows-latest
+          - os: windows-2019
             py-ver: pypy3
 
     steps:
@@ -50,9 +58,32 @@ jobs:
     - name: test
       run: python -m unittest discover -v tests
 
+  e2e-test:
+    timeout-minutes: 20
+    name: e2e-test
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ env.DOCKER_PYTHON_VERSION }}
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: install pip
+      run: python -m pip install -U pip
+    - name: create wheel
+      run: pip wheel .
+    - name: e2e-test
+      run: |
+        docker login docker.pkg.github.com -u owner -p ${{ secrets.GITHUB_TOKEN }}
+        docker pull ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+        docker run -v ${{ github.workspace }}:/github/workspace --entrypoint ${{ env.ENTRYPOINT_PATH }} ${{ env.GITHUB_DOCKER_IMAGE }}:${{ env.GITHUB_VERSION }}
+
   doxygen-ubuntu:
     name: doxygen-ubuntu
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
     - uses: actions/checkout@v2
     - name: install_doxygen

diff --git a/.github/workflows/code_scanner.yml b/.github/workflows/code_scanner.yml
@@ -16,7 +16,7 @@ on:
 jobs:
   analyze-CodeQL:
     name: CodeQL
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     strategy:
       fail-fast: false
@@ -68,7 +68,7 @@ jobs:
   OSSAR-Scan:
     # OSSAR runs on windows-latest.
     # ubuntu-latest and macos-latest support coming soon
-    runs-on: windows-latest
+    runs-on: windows-2019
 
     steps:
       # Checkout your code repository to scan

diff --git a/.github/workflows/create_release-and-upload.yml b/.github/workflows/create_release-and-upload.yml
@@ -8,7 +8,7 @@ on:
 jobs:
   create_releases:
     name: create-releases
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     outputs:
       release_url: ${{ steps.output_url.outputs.upload_url }}
 
@@ -53,7 +53,7 @@ jobs:
     name: upload-sdist
     needs: create_releases
     timeout-minutes: 20
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - name: checkout
@@ -109,15 +109,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-10.15, windows-latest, ubuntu-18.04]
+        os: [macos-10.15, windows-2019, ubuntu-18.04]
         include:
           - os: macos-10.15
             py-ver: 3.6
             pl-name: macosx_10_15_x86_64
           - os: ubuntu-18.04
             py-ver: 3.6
             pl-name: linux_x86_64
-          - os: windows-latest
+          - os: windows-2019
             py-ver: 3.8
             pl-name: win_amd64
 

diff --git a/.github/workflows/docker/test_entrypoint.sh b/.github/workflows/docker/test_entrypoint.sh
@@ -0,0 +1,62 @@
+#!/bin/bash -u
+
+# while :; do sleep 10; done
+export WORKDIR_ROOT=github
+export WORK_DIR=workspace
+export WORKDIR_PATH=/${WORKDIR_ROOT}/${WORK_DIR}
+
+cd /${WORKDIR_ROOT}
+if [ ! -d ${WORK_DIR} ]; then
+  mkdir ${WORK_DIR}
+fi
+
+cd ${WORKDIR_PATH}
+rm -rf bitcoind_datadir
+rm -rf elementsd_datadir
+
+mkdir bitcoind_datadir
+chmod 777 bitcoind_datadir
+# cp /root/.bitcoin/bitcoin.conf bitcoind_datadir/
+cp ./integration_test/bitcoin.conf bitcoind_datadir/
+mkdir elementsd_datadir
+chmod 777 elementsd_datadir
+# cp /root/.elements/elements.conf elementsd_datadir/
+cp ./integration_test/elements.conf elementsd_datadir/
+
+# boot daemon
+bitcoind --regtest -datadir=${WORKDIR_PATH}/bitcoind_datadir
+bitcoin-cli --regtest -datadir=${WORKDIR_PATH}/bitcoind_datadir ping > /dev/null 2>&1
+while [ $? -ne 0 ]
+do
+  bitcoin-cli --regtest -datadir=${WORKDIR_PATH}/bitcoind_datadir ping > /dev/null 2>&1
+done
+echo "start bitcoin node"
+
+elementsd -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir
+elements-cli -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir ping > /dev/null 2>&1
+while [ $? -ne 0 ]
+do
+  elements-cli -chain=liquidregtest -datadir=${WORKDIR_PATH}/elementsd_datadir ping > /dev/null 2>&1
+done
+echo "start elements node"
+
+set -e
+
+python3 --version
+
+pip3 install *.whl
+pip3 install python-bitcoinrpc
+
+cd integration_test
+
+python3 tests/test_bitcoin.py -v
+if [ $? -gt 0 ]; then
+  cd ../..
+  exit 1
+fi
+
+python3 tests/test_elements.py -v
+if [ $? -gt 0 ]; then
+  cd ../..
+  exit 1
+fi
diff --git a/.gitignore b/.gitignore
@@ -142,3 +142,6 @@ cmake_build/
 /doc/latex
 /**/*_localdebug.bat
 /*.whl
+/integration_test/localdata
+/integration_test/bitcoind_datadir
+/integration_test/elementsd_datadir