Skip to content

Commit

Permalink
Merge pull request #36 from helium/adt/erlang-tc
Browse files Browse the repository at this point in the history
Swich to erlang-tc for threshold-cryptography
  • Loading branch information
Vagabond committed May 3, 2021
2 parents 31e73a6 + 505e91a commit a22b841
Show file tree
Hide file tree
Showing 28 changed files with 743 additions and 1,580 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

jobs:
CI:
runs-on: ubuntu-18.04
container: heliumsystems/builder-erlang:2
runs-on: ubuntu-latest
# container: heliumsystems/builder-erlang:2

steps:
- name: Checkout
Expand Down Expand Up @@ -39,17 +39,23 @@ jobs:
restore-keys: |
${{ runner.os }}-dialyzer-
- name: Build
run: rebar3 compile
- name: Install stable choolchain
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true

- name: Run tests
run: rebar3 as test do eunit,ct,cover
- name: Build
run: make

- name: Run Dialyzer
run: rebar3 do dialyzer #, xref
run: make typecheck

- name: Run tests
run: make test

- name: Generate coverage report
run: rebar3 covertool generate
run: make cover

- name: Upload coverage report
if: ${{ !env.ACT }}
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ clean:
$(REBAR) clean

cover:
$(REBAR) cover
$(REBAR) covertool generate

test: compile
$(REBAR) as test do ct
$(REBAR) as test do eunit,ct

typecheck:
$(REBAR) dialyzer
Expand Down
3 changes: 1 addition & 2 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
]}.

{deps, [
{erlang_pbc, ".*", {git, "https://github.com/helium/erlang_pbc.git", {branch, "master"}}}
{erlang_tc, ".*", {git, "https://github.com/helium/erlang-tc.git", {branch, "main"}}}
]}.

{profiles, [
{test, [
{deps, [
{erlang_tpke, ".*", {git, "https://github.com/helium/erlang-tpke.git", {branch, "master"}}},
{relcast, ".*", {git, "https://github.com/helium/relcast.git", {branch, "master"}}}
]}
]}
Expand Down
6 changes: 3 additions & 3 deletions rebar.lock
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[{<<"erlang_pbc">>,
{git,"https://github.com/helium/erlang_pbc.git",
{ref,"1d2651ba01ba81b748c553d9f729c0e167eeab72"}},
[{<<"erlang_tc">>,
{git,"https://github.com/helium/erlang-tc.git",
{ref,"b3ef1d5541586f5c85b6d231345a921d57be32a3"}},
0}].
2 changes: 1 addition & 1 deletion src/dkg.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{applications,
[kernel,
stdlib,
erlang_pbc
erlang_tc
]},
{env,[]},
{modules, []},
Expand Down
162 changes: 0 additions & 162 deletions src/dkg_bipolynomial.erl

This file was deleted.

Loading

0 comments on commit a22b841

Please sign in to comment.