Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,7 @@ module {:options "-functionSyntax:4"} EsdkTestManifests {
==>
SupportedEncryptVersion?(manifestData.value.version)
{
var decryptManifestBv :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
var decryptManifestBytes := BvToBytes(decryptManifestBv);
var decryptManifestBytes :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
var manifestJson :- API.Deserialize(decryptManifestBytes)
.MapFailure(( e: Errors.DeserializationError ) => e.ToString());
:- Need(manifestJson.Object?, "Not a JSON object");
Expand Down
6 changes: 2 additions & 4 deletions TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy
Original file line number Diff line number Diff line change
Expand Up @@ -542,14 +542,12 @@ module {:options "-functionSyntax:4"} EsdkTestVectors {
method ReadVectorsFile(location: string)
returns (output: Result<seq<uint8>, string>)
{
var fileBv :- FileIO.ReadBytesFromFile(location);
output := Success(BvToBytes(fileBv));
output := FileIO.ReadBytesFromFile(location);
}

method WriteVectorsFile(location: string, bytes: seq<uint8>)
returns (output: Result<(), string>)
{
var bv := BytesBv(bytes);
output := FileIO.WriteBytesToFile(location, bv);
output := FileIO.WriteBytesToFile(location, bytes);
}
}
6 changes: 2 additions & 4 deletions TestVectors/dafny/TestVectors/src/WriteVectors.dfy
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
);

var esdkEncryptManifestBytes :- expect API.Serialize(esdkEncryptManifests);
var esdkEncryptManifestBv := JSONHelpers.BytesBv(esdkEncryptManifestBytes);

var _ :- expect FileIO.WriteBytesToFile(
op.encryptManifestOutput + "encrypt-manifest.json",
esdkEncryptManifestBv
esdkEncryptManifestBytes
);

output := Success(());
Expand Down Expand Up @@ -155,11 +154,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
);

var esdkDecryptManifestBytes :- expect API.Serialize(esdkDecryptManifest);
var esdkDecryptManifestBv := JSONHelpers.BytesBv(esdkDecryptManifestBytes);

var _ :- expect FileIO.WriteBytesToFile(
op.decryptManifestOutput + "manifest.json",
esdkDecryptManifestBv
esdkDecryptManifestBytes
);

output := Success(());
Expand Down
2 changes: 1 addition & 1 deletion libraries
Submodule libraries updated 47 files
+1 −1 .github/workflows/check-examples-in-docs.yml
+12 −2 .github/workflows/reusable-tests.yml
+1 −1 .github/workflows/tests.yml
+2 −0 README.md
+1 −1 Scripts/check-examples
+2 −2 examples/BinaryOperations.dfy
+3 −1 examples/Collections/Arrays/BinarySearch.dfy
+0 −2 examples/MutableMap/MutableMapExamples.dfy
+14 −14 examples/RelationsExamples.dfy
+3 −1 examples/WrappersExamples.dfy
+1 −1 src/BoundedInts.dfy
+1 −1 src/Collections/Arrays/BinarySearch.dfy
+2 −2 src/Collections/Sequences/LittleEndianNat.dfy
+28 −4 src/Collections/Sequences/LittleEndianNatConversions.dfy
+2 −2 src/Collections/Sequences/MergeSort.dfy
+48 −109 src/Collections/Sequences/Seq.dfy
+6 −6 src/Collections/Sets/Isets.dfy
+14 −14 src/Collections/Sets/Sets.dfy
+94 −83 src/FileIO/FileIO.cs
+26 −5 src/FileIO/FileIO.dfy
+1 −1 src/JSON/Tests.dfy
+1 −1 src/JSON/Utils/Cursors.dfy
+2 −2 src/JSON/Utils/Lexers.dfy
+1 −1 src/JSON/Utils/Views.Writers.dfy
+1 −1 src/JSON/Utils/Views.dfy
+3 −3 src/JSON/ZeroCopy/Deserializer.dfy
+2 −2 src/JSON/ZeroCopy/Serializer.dfy
+0 −11 src/MutableMap/MutableMap.dfy
+1 −2 src/MutableMap/MutableMap.java
+13 −10 src/NonlinearArithmetic/DivMod.dfy
+69 −13 src/NonlinearArithmetic/Internals/ModInternals.dfy
+1 −0 src/NonlinearArithmetic/Logarithm.dfy
+11 −4 src/NonlinearArithmetic/Mul.dfy
+20 −5 src/NonlinearArithmetic/Power.dfy
+2 −0 src/NonlinearArithmetic/Power2.dfy
+1 −1 src/Relations.dfy
+1 −1 src/dafny/BoundedInts.dfy
+1 −1 src/dafny/Collections/Arrays.dfy
+3 −3 src/dafny/Collections/Isets.dfy
+2 −2 src/dafny/Collections/LittleEndianNat.dfy
+64 −128 src/dafny/Collections/Seqs.dfy
+15 −15 src/dafny/Collections/Sets.dfy
+2 −0 src/dafny/NonlinearArithmetic/DivMod.dfy
+5 −5 src/dafny/NonlinearArithmetic/Internals/ModInternals.dfy
+3 −3 src/dafny/NonlinearArithmetic/Multiply.dfy
+21 −5 src/dafny/NonlinearArithmetic/Power.dfy
+2 −0 src/dafny/NonlinearArithmetic/Power2.dfy
2 changes: 1 addition & 1 deletion mpl
Submodule mpl updated from aa2bed to 80e28f