Upgrade moc/base.

.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

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

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

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";

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";
 

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]) : () {

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<T>(

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.

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";
 

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";
 

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";
 

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";
 

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"
 }