Merge pull request #166 from mlabs-haskell/szg251/rust-testsuites

Rust testsuites

Author: szg251

extras/lbf-nix/lbf-rust.nix

@@ -86,7 +86,7 @@ let
     text = ''
       num-bigint = "0.4.4"
       serde_json = { version = "1.0.107", features = ["arbitrary_precision"] }
-      plutus-ledger-api = { git = "https://github.com/mlabs-haskell/plutus-ledger-api-rust", features = [ "lbf", ], rev = "fb93fa590908580eb40368369bf6614d42ce9a95" }
+      plutus-ledger-api = { git = "https://github.com/mlabs-haskell/plutus-ledger-api-rust", features = [ "lbf", ], ref = "szg251/fix-lbf", rev = "4460f2ff8af7993a24209ebe28df5ef9b3b3b397" }
     '';
   };
 

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/LamVal.hs

@@ -335,14 +335,10 @@ printRefE pkgs ref = do
   qvn <- LV.resolveRef ref
   case ref of
     (argTy : _, builtin)
-      | builtin
-          == "toPlutusData"
-          || builtin
-            == "fromPlutusData"
-          || builtin
-            == "toJson"
-          || builtin
-            == "fromJson" -> do
+      | builtin == "toPlutusData"
+          || builtin == "fromPlutusData"
+          || builtin == "toJson"
+          || builtin == "fromJson" -> do
           lamTyDoc <- printLamTy pkgs argTy
           methodDoc <- R.printRsValName . R.qualifiedEntity <$> LV.importValue qvn
           return $ angles lamTyDoc <> R.doubleColon <> methodDoc

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/Syntax.hs

@@ -125,7 +125,14 @@ printMkCtor :: PC.TyName -> Doc ann
 printMkCtor = printTyName
 
 printFieldName :: PC.FieldName -> Doc ann
-printFieldName (PC.FieldName n _) = pretty n
+printFieldName (PC.FieldName n _) = pretty . toSnakeCase $ n
+
+toSnakeCase :: Text -> Text
+toSnakeCase = Text.concatMap f
+  where
+    f c
+      | Char.isUpper c = "_" <> Text.toLower (Text.singleton c)
+      | otherwise = Text.singleton c
 
 printVarName :: PC.VarName -> Doc ann
 printVarName (PC.VarName n _) = pretty n

lambda-buffers-codegen/src/LambdaBuffers/Codegen/Rust/Print/TyDef.hs

@@ -61,9 +61,12 @@ printTyDef pkgs (PC.TyDef tyN tyabs _) = do
     else return $ group $ printTyDefKw kw <+> printTyName tyN <> generics <+> equals <+> absDoc
 
 printTyDefKw :: TyDefKw -> Doc ann
-printTyDefKw StructTyDef = "pub struct"
-printTyDefKw EnumTyDef = "pub enum"
-printTyDefKw SynonymTyDef = "pub type"
+printTyDefKw StructTyDef = pub "struct"
+printTyDefKw EnumTyDef = pub "enum"
+printTyDefKw SynonymTyDef = pub "type"
+
+pub :: Doc ann -> Doc ann
+pub doc = "pub" <+> doc
 
 box :: R.QTyName
 box = R.qForeignRef R.MkTyName "std" ["boxed"] "Box"
@@ -164,7 +167,7 @@ printProd pkgs parentTyN tyArgs (PC.Product fields _) = do
       phantomFields = printPhantomData <$> phantomTyArgs
   if null fields && null phantomTyArgs
     then return semi
-    else return $ encloseSep lparen rparen comma (tyDocs <> phantomFields) <> semi
+    else return $ encloseSep lparen rparen comma (pub <$> (tyDocs <> phantomFields)) <> semi
 
 {- | Filter out unused type arguments in order to make PhantomData fields for them
 This is done in a recursive manner: if we encounter a type application, we resolve the type from TyDefs, and substitute
@@ -223,7 +226,7 @@ printField :: MonadPrint m => R.PkgMap -> PC.TyName -> PC.Field -> m (Doc ann)
 printField pkgs parentTyN (PC.Field fn ty) = do
   let fnDoc = printFieldName fn
   tyDoc <- printTyTopLevel pkgs parentTyN ty
-  return $ fnDoc <> colon <+> tyDoc
+  return $ pub fnDoc <> colon <+> tyDoc
 
 printPhantomData :: PC.TyArg -> Doc ann
 printPhantomData tyArg =

runtimes/rust/lbr-prelude/src/error.rs

@@ -29,6 +29,8 @@ impl From<&Value> for JsonType {
 /// Error type representing Json conversion errors
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
+    #[error("Malformed JSON string, unable to parse")]
+    MalformedJson,
     #[error("{parser:?} > Expected a JSON type: {wanted:?}, but got a JSON type: {got:?}")]
     UnexpectedJsonType {
         got: JsonType,

runtimes/rust/lbr-prelude/src/json.rs

@@ -18,6 +18,19 @@ pub trait Json {
     fn from_json(value: &Value) -> Result<Self, Error>
     where
         Self: Sized;
+
+    fn to_json_string(&self) -> String {
+        self.to_json().to_string()
+    }
+
+    fn from_json_string(string: &str) -> Result<Self, Error>
+    where
+        Self: Sized,
+    {
+        Value::from_str(string)
+            .map_err(|_| Error::MalformedJson)
+            .and_then(|value| Self::from_json(&value))
+    }
 }
 
 //  lbf-prelude::json instance rule implementations

testsuites/lbt-plutus/lbt-plutus-rust/Cargo.lock

@@ -4,10 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+plutus-ledger-api = { git = "https://github.com/mlabs-haskell/plutus-ledger-api-rust", features = [
+  "lbf",
+], ref = "szg251/fix-lbf", rev = "4460f2ff8af7993a24209ebe28df5ef9b3b3b397" }
 lbf-plutus-rust-golden-api = { path = ".extras/lbf-plutus-rust-golden-api" }
 lbf-prelude = { path = ".extras/lbf-prelude" }
+lbr-prelude = { path = ".extras/lbr-prelude" }
 serde_json = "1.0.108"
 num-bigint = "0.4.4"
-plutus-ledger-api = { git = "https://github.com/mlabs-haskell/plutus-ledger-api-rust", features = [
-  "lbf",
-], rev = "fb93fa590908580eb40368369bf6614d42ce9a95" }