Skip to content

Commit 90f55db

Browse files
authored
chore(dafny): allow FileIO to deal in uint8, rather than bv8 (#770)
1 parent 7236084 commit 90f55db

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ module {:options "-functionSyntax:4"} EsdkTestManifests {
248248
==>
249249
SupportedEncryptVersion?(manifestData.value.version)
250250
{
251-
var decryptManifestBv :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
252-
var decryptManifestBytes := BvToBytes(decryptManifestBv);
251+
var decryptManifestBytes :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
253252
var manifestJson :- API.Deserialize(decryptManifestBytes)
254253
.MapFailure(( e: Errors.DeserializationError ) => e.ToString());
255254
:- Need(manifestJson.Object?, "Not a JSON object");

TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,14 +542,12 @@ module {:options "-functionSyntax:4"} EsdkTestVectors {
542542
method ReadVectorsFile(location: string)
543543
returns (output: Result<seq<uint8>, string>)
544544
{
545-
var fileBv :- FileIO.ReadBytesFromFile(location);
546-
output := Success(BvToBytes(fileBv));
545+
output := FileIO.ReadBytesFromFile(location);
547546
}
548547

549548
method WriteVectorsFile(location: string, bytes: seq<uint8>)
550549
returns (output: Result<(), string>)
551550
{
552-
var bv := BytesBv(bytes);
553-
output := FileIO.WriteBytesToFile(location, bv);
551+
output := FileIO.WriteBytesToFile(location, bytes);
554552
}
555553
}

TestVectors/dafny/TestVectors/src/WriteVectors.dfy

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
108108
);
109109

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

113112
var _ :- expect FileIO.WriteBytesToFile(
114113
op.encryptManifestOutput + "encrypt-manifest.json",
115-
esdkEncryptManifestBv
114+
esdkEncryptManifestBytes
116115
);
117116

118117
output := Success(());
@@ -155,11 +154,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
155154
);
156155

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

160158
var _ :- expect FileIO.WriteBytesToFile(
161159
op.decryptManifestOutput + "manifest.json",
162-
esdkDecryptManifestBv
160+
esdkDecryptManifestBytes
163161
);
164162

165163
output := Success(());

libraries

Submodule libraries updated 47 files

mpl

Submodule mpl updated from aa2bed1 to 80e28f3

0 commit comments

Comments
 (0)