changed extra type optional; updated examples

entropyxyz · Oct 31, 2023 · 0e20cdc · 0e20cdc
1 parent 416b784
commit 0e20cdc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/examples/barebones/src/lib.rs b/examples/barebones/src/lib.rs
@@ -40,7 +40,8 @@ mod tests {
     #[test]
     fn test_should_sign() {
         let signature_request = InitialState {
-            data: "some_data_longer_than_10_bytes".to_string().into_bytes(),
+            preimage: "some_data_longer_than_10_bytes".to_string().into_bytes(),
+            extra: None
         };
 
         assert!(BarebonesProgram::evaluate(signature_request).is_ok());
@@ -50,7 +51,8 @@ mod tests {
     fn test_should_error() {
         // data being checked is under 10 bytes in length
         let signature_request = InitialState {
-            data: "under10".to_string().into_bytes(),
+            preimage: "under10".to_string().into_bytes(),
+            extra: None
         };
 
         assert!(BarebonesProgram::evaluate(signature_request).is_err());

diff --git a/examples/basic-transaction/src/lib.rs b/examples/basic-transaction/src/lib.rs
@@ -54,7 +54,8 @@ mod tests {
     fn test_evaluate() {
         let signature_request = InitialState {
             // `data` is an RLP serialized ETH transaction with the recipient set to `0x772b9a9e8aa1c9db861c6611a82d251db4fac990`
-            data: "0xef01808094772b9a9e8aa1c9db861c6611a82d251db4fac990019243726561746564204f6e20456e74726f7079018080".to_string().into_bytes(),
+            preimage: "0xef01808094772b9a9e8aa1c9db861c6611a82d251db4fac990019243726561746564204f6e20456e74726f7079018080".to_string().into_bytes(),
+            extra: None
         };
 
         assert!(BasicTransaction::evaluate(signature_request).is_ok());
@@ -64,7 +65,8 @@ mod tests {
     fn test_start_fail() {
         let signature_request = InitialState {
             // `data` is the same as previous test, but recipient address ends in `1` instead of `0`, so it should fail
-            data: "0xef01808094772b9a9e8aa1c9db861c6611a82d251db4fac991019243726561746564204f6e20456e74726f7079018080".to_string().into_bytes(),
+            preimage: "0xef01808094772b9a9e8aa1c9db861c6611a82d251db4fac991019243726561746564204f6e20456e74726f7079018080".to_string().into_bytes(),
+            extra: None
         };
 
         assert!(BasicTransaction::evaluate(signature_request).is_err());

diff --git a/examples/siwe/src/lib.rs b/examples/siwe/src/lib.rs
@@ -43,12 +43,14 @@ export_program!(Siwe);
 // write a test that calls evaluate and passes it the proper parameters
 #[cfg(test)]
 mod tests {
+    use alloc::vec;
+
     use super::*;
 
     #[test]
     fn test_should_sign() {
         let signature_request = InitialState {
-            data: "localhost wants you to sign in with your Ethereum account:
+            preimage: "localhost wants you to sign in with your Ethereum account:
 0x6Ee9894c677EFa1c56392e5E7533DE76004C8D94
 
 This is a test statement.
@@ -60,6 +62,7 @@ Nonce: oNCEHm5jzQU2WvuBB
 Issued At: 2022-01-28T23:28:16.013Z"
                 .to_string()
                 .into_bytes(),
+            extra: None
         };
 
         assert!(Siwe::evaluate(signature_request).is_ok());
@@ -68,7 +71,7 @@ Issued At: 2022-01-28T23:28:16.013Z"
     #[test]
     fn test_bad_siwe_message() {
         let signature_request = InitialState {
-            data: "localhost does not want you to sign in with your Ethereum account:
+            preimage: "localhost does not want you to sign in with your Ethereum account:
 0x6Ee9894c677EFa1c56392e5E7533DE76004C8D94
 
 This is a test statement.
@@ -80,6 +83,7 @@ Nonce: oNCEHm5jzQU2WvuBB
 Issued At: 2022-01-28T23:28:16.013Z"
                 .to_string()
                 .into_bytes(),
+            extra: None
         };
 
         assert!(Siwe::evaluate(signature_request).is_err());
@@ -88,7 +92,7 @@ Issued At: 2022-01-28T23:28:16.013Z"
     #[test]
     fn test_bad_domain() {
         let signature_request = InitialState {
-            data: "google.com does not want you to sign in with your Ethereum account:
+            preimage: "google.com does not want you to sign in with your Ethereum account:
 0x6Ee9894c677EFa1c56392e5E7533DE76004C8D94
 
 This is a test statement.
@@ -100,6 +104,7 @@ Nonce: oNCEHm5jzQU2WvuBB
 Issued At: 2022-01-28T23:28:16.013Z"
                 .to_string()
                 .into_bytes(),
+            extra: None
         };
 
         assert!(Siwe::evaluate(signature_request).is_err());

diff --git a/wit/application.wit b/wit/application.wit
@@ -13,6 +13,6 @@ world program {
     /// Preimage of the user's data under program evaulation (eg. RLP-encoded ETH transaction request).
     preimage: list<u8>,
     /// Auxiliary data required for program evaluation, that won't be signed (eg. zero-knowledge proof, third party signature)
-    extra: list<u8>
+    extra: option<list<u8>>
   }
 }