From daddf4e03e2f224f2b27b1119f95c4791364767f Mon Sep 17 00:00:00 2001 From: Quint Daenen Date: Thu, 15 Dec 2022 22:19:52 +0100 Subject: [PATCH] Upgrade moc/base. --- .github/workflows/test.yml | 10 ++++++---- Makefile | 5 +++++ package-set.dhall | 19 +++++++++++++++++-- src/AES.mo | 6 +++--- src/HMAC.mo | 2 +- src/SHA/SHA2.mo | 12 ++++++------ src/Utilities.mo | 6 +++--- test/AES.mo | 2 +- test/CAVS.mo | 6 +++--- test/SHA224.mo | 4 ++-- test/SHA256.mo | 4 ++-- test/Utilities.mo | 4 ++-- vessel.dhall | 4 ++-- 13 files changed, 53 insertions(+), 31 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index add2d22..df6c4fd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -3,9 +3,11 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: aviate-labs/setup-dfx@v0.2.3 with: - dfx-version: 0.8.3 - vessel-version: 0.6.2 - - run: for i in test/*.mo ; do $(vessel bin)/moc $(vessel sources 2>/dev/null) -r $i ; done + dfx-version: 0.12.1 + vessel-version: 0.6.3 + - run: | + make check + make test diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..a43ee64 --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +.PHONY: check test +check: + find src -type f -name '*.mo' -print0 | xargs -0 $(shell vessel bin)/moc $(shell vessel sources 2>/dev/null) --check +test: + find test -type f -name '*.mo' -print0 | xargs -0 $(shell vessel bin)/moc $(shell vessel sources 2>/dev/null) -r diff --git a/package-set.dhall b/package-set.dhall index 2ef6d1d..64c86a3 100644 --- a/package-set.dhall +++ b/package-set.dhall @@ -1,2 +1,17 @@ -let upstream = https://github.com/aviate-labs/package-set/releases/download/v0.1.7/package-set.dhall sha256:433429e918c292301ae0a7fa2341d463fea2d586c3f9d03209d68ca52e987aa8 -in upstream +let base = https://github.com/internet-computer/base-package-set/releases/download/moc-0.7.4/package-set.dhall sha256:3a20693fc597b96a8c7cf8645fda7a3534d13e5fbda28c00d01f0b7641efe494 +let Package = { name : Text, version : Text, repo : Text, dependencies : List Text } + +let additions = [ + { name = "array" + , version = "v0.2.1" + , repo = "https://github.com/aviate-labs/array.mo" + , dependencies = [ "base-0.7.3" ] : List Text + }, + { name = "encoding" + , version = "v0.4.1" + , repo = "https://github.com/aviate-labs/encoding.mo" + , dependencies = [ "base-0.7.3", "array" ] + } +] : List Package + +in base # additions diff --git a/src/AES.mo b/src/AES.mo index 38dd3e0..15ab7ab 100644 --- a/src/AES.mo +++ b/src/AES.mo @@ -1,6 +1,6 @@ -import Array "mo:base/Array"; -import Nat8 "mo:base/Nat8"; -import Nat32 "mo:base/Nat32"; +import Array "mo:base-0.7.3/Array"; +import Nat8 "mo:base-0.7.3/Nat8"; +import Nat32 "mo:base-0.7.3/Nat32"; import Binary "mo:encoding/Binary"; import Cipher "Cipher"; diff --git a/src/HMAC.mo b/src/HMAC.mo index 894e25f..1ae600a 100644 --- a/src/HMAC.mo +++ b/src/HMAC.mo @@ -1,4 +1,4 @@ -import Array "mo:base/Array"; +import Array "mo:base-0.7.3/Array"; import Hash "Hash"; import Util "Utilities"; diff --git a/src/SHA/SHA2.mo b/src/SHA/SHA2.mo index 65d3d31..336ca3f 100644 --- a/src/SHA/SHA2.mo +++ b/src/SHA/SHA2.mo @@ -1,9 +1,9 @@ -import Array "mo:base/Array"; -import Buffer "mo:base/Buffer"; +import Array "mo:base-0.7.3/Array"; +import Buffer "mo:base-0.7.3/Buffer"; import Binary "mo:encoding/Binary"; -import Iter "mo:base/Iter"; -import Nat32 "mo:base/Nat32"; -import Nat64 "mo:base/Nat64"; +import Iter "mo:base-0.7.3/Iter"; +import Nat32 "mo:base-0.7.3/Nat32"; +import Nat64 "mo:base-0.7.3/Nat64"; import Hash "../Hash"; import Util "../Utilities"; @@ -74,7 +74,7 @@ module { digest.add(v); }; }; - digest.toArray(); + Buffer.toArray(digest); }; public func write(bs : [Nat8]) : () { diff --git a/src/Utilities.mo b/src/Utilities.mo index b7cb29e..3df3660 100644 --- a/src/Utilities.mo +++ b/src/Utilities.mo @@ -1,6 +1,6 @@ -import Array "mo:base/Array"; -import Nat8 "mo:base/Nat8"; -import Nat32 "mo:base/Nat32"; +import Array "mo:base-0.7.3/Array"; +import Nat8 "mo:base-0.7.3/Nat8"; +import Nat32 "mo:base-0.7.3/Nat32"; module Utilities { public func copy( diff --git a/test/AES.mo b/test/AES.mo index f3b5afe..038d426 100644 --- a/test/AES.mo +++ b/test/AES.mo @@ -1,6 +1,6 @@ import AES "../src/AES"; -import D "mo:base/Debug"; +import D "mo:base-0.7.3/Debug"; for ((key, i, o) in ([ ( // Appendix B. diff --git a/test/CAVS.mo b/test/CAVS.mo index ad2af46..5cfdd0e 100644 --- a/test/CAVS.mo +++ b/test/CAVS.mo @@ -1,8 +1,8 @@ -import Array "mo:base/Array"; -import Blob "mo:base/Blob"; +import Array "mo:base-0.7.3/Array"; +import Blob "mo:base-0.7.3/Blob"; import Hex "mo:encoding/Hex"; -import Debug "mo:base/Debug"; +import Debug "mo:base-0.7.3/Debug"; import SHA256 "../src/SHA/SHA256"; diff --git a/test/SHA224.mo b/test/SHA224.mo index ed2882a..340e999 100644 --- a/test/SHA224.mo +++ b/test/SHA224.mo @@ -1,6 +1,6 @@ -import Blob "mo:base/Blob"; +import Blob "mo:base-0.7.3/Blob"; import Hex "mo:encoding/Hex"; -import Text "mo:base/Text"; +import Text "mo:base-0.7.3/Text"; import SHA224 "../src/SHA/SHA224"; diff --git a/test/SHA256.mo b/test/SHA256.mo index e613f7f..3545d2a 100644 --- a/test/SHA256.mo +++ b/test/SHA256.mo @@ -1,6 +1,6 @@ -import Blob "mo:base/Blob"; +import Blob "mo:base-0.7.3/Blob"; import Hex "mo:encoding/Hex"; -import Text "mo:base/Text"; +import Text "mo:base-0.7.3/Text"; import SHA256 "../src/SHA/SHA256"; diff --git a/test/Utilities.mo b/test/Utilities.mo index db66d04..d7991ae 100644 --- a/test/Utilities.mo +++ b/test/Utilities.mo @@ -1,6 +1,6 @@ import Prim "mo:⛔"; -import Array "mo:base/Array"; -import Iter "mo:base/Iter"; +import Array "mo:base-0.7.3/Array"; +import Iter "mo:base-0.7.3/Iter"; import Util "../src/Utilities"; diff --git a/vessel.dhall b/vessel.dhall index 27cad09..f20b280 100644 --- a/vessel.dhall +++ b/vessel.dhall @@ -1,4 +1,4 @@ { - dependencies = [ "base", "encoding" ], - compiler = Some "0.7.0" + dependencies = [ "base-0.7.3", "encoding" ], + compiler = Some "0.7.3" } \ No newline at end of file