revert to unjammed simulated storage

Author: lukaszcz

app/Commands/Dev/Nockma/Run/BuiltinEvaluator.hs

@@ -22,7 +22,7 @@ runCommand opts = do
     t@(TermCell {}) -> do
       let formula = anomaCallTuple parsedArgs
           storageJammedTerms = map Encoding.atomToByteString' . mapMaybe getAtom $ maybe [] unfoldList parsedStorage
-          storage = foldr insertJammedStorage emptyStorage storageJammedTerms
+      storage <- runAppError @SimpleError $ foldrM insertJammedStorage emptyStorage storageJammedTerms
       (counts, res) <-
         runOpCounts
           . runReader defaultEvalOptions

src/Juvix/Compiler/Nockma/Evaluator.hs

@@ -259,7 +259,10 @@ evalProfile inistack initerm =
                 TermAtom a -> do
                   r <- Encoding.cueEither a
                   either (throwDecodingFailed args') return r
-                TermCell {} -> throwDecodingFailed args' DecodingErrorExpectedAtom
+                TermCell {} ->
+                  -- In the simulated storage, we allow already decoded cells
+                  -- for efficiency. Decoding these should then be a no-op.
+                  return args'
               StdlibVerifyDetached -> case args' of
                 TCell (TermAtom sig) (TCell (TermAtom message) (TermAtom pubKey)) -> goVerifyDetached sig message pubKey
                 _ -> error "expected a term of the form [signature (atom) message (encoded term) public_key (atom)]"

src/Juvix/Compiler/Nockma/Evaluator/Storage.hs

@@ -90,14 +90,11 @@ mkModuleStorage mtab =
         fromJust (md' ^. moduleInfoTable . infoCode)
       )
 
-insertJammedStorage :: ByteString -> Storage Natural -> Storage Natural
-insertJammedStorage jammedTerm storage =
-  over storageKeyValueData (HashMap.insert (StorageKey sha256) jammedAtom) storage
+insertJammedStorage :: (Member (Error SimpleError) r) => ByteString -> Storage Natural -> Sem r (Storage Natural)
+insertJammedStorage jammedTerm storage = do
+  term <- decodeCue jammedTerm
+  return $ over storageKeyValueData (HashMap.insert (StorageKey sha256) term) storage
   where
-    jammedAtom =
-      TermAtom
-        . byteStringToAtom'
-        $ jammedTerm
     sha256 =
       TermAtom
         . byteStringToAtom'