Update Merkle library for the Stdlib 2.0.0

aiken-lang · Sep 6, 2024 · 463b9e3 · 463b9e3
1 parent d13c449
commit 463b9e3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/on-chain/aiken.lock b/on-chain/aiken.lock
@@ -3,7 +3,7 @@
 
 [[requirements]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "2.0.0"
 source = "github"
 
 [[requirements]]
@@ -13,7 +13,7 @@ source = "github"
 
 [[packages]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "2.0.0"
 requirements = []
 source = "github"
 
@@ -24,4 +24,4 @@ requirements = []
 source = "github"
 
 [etags]
-"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1724333442, nanos_since_epoch = 924827000 }, "24d601fa19a2002318495bbb8562b9677563ca1b5c03126d6b093a65df076bef"]
+"aiken-lang/fuzz@main" = [{ secs_since_epoch = 1725585344, nanos_since_epoch = 985841000 }, "34ffec10cce786bf823c7505589a3b5e0663792ef8efd31f870d7bcc37e0f593"]
diff --git a/on-chain/aiken.toml b/on-chain/aiken.toml
@@ -10,7 +10,7 @@ platform = "github"
 
 [[dependencies]]
 name = "aiken-lang/stdlib"
-version = "1.9.0"
+version = "2.0.0"
 source = "github"
 
 [[dependencies]]

diff --git a/on-chain/lib/aiken/merkle-patricia-forestry.ak b/on-chain/lib/aiken/merkle-patricia-forestry.ak
@@ -31,11 +31,11 @@
 ////  10⁹ |          990   | 280K          | 126M          |
 
 use aiken/builtin.{blake2b_256, slice_bytearray}
-use aiken/bytearray
 use aiken/merkle_patricia_forestry/helpers.{combine, nibble, nibbles, suffix}
 use aiken/merkle_patricia_forestry/merkling.{
   merkle_16, null_hash, sparse_merkle_16,
 }
+use aiken/primitive/bytearray
 
 // -----------------------------------------------------------------------------
 // ------------------------------------------------------------------- Constants

diff --git a/on-chain/lib/aiken/merkle-patricia-forestry.tests.ak b/on-chain/lib/aiken/merkle-patricia-forestry.tests.ak
@@ -1,6 +1,6 @@
 use aiken/cbor
+use aiken/collection/list
 use aiken/fuzz
-use aiken/list
 use aiken/merkle_patricia_forestry.{
   Branch, Fork, Leaf, MerklePatriciaForestry, Neighbor, Proof, ProofStep,
 } as mpf

diff --git a/on-chain/lib/aiken/merkle-patricia-forestry/helpers.ak b/on-chain/lib/aiken/merkle-patricia-forestry/helpers.ak
@@ -4,7 +4,7 @@
 //// exposed for internal testing and module splitting.
 
 use aiken/builtin.{blake2b_256, index_bytearray}
-use aiken/bytearray
+use aiken/primitive/bytearray
 
 // -----------------------------------------------------------------------------
 // --------------------------------------------------------------------- combine