Add decoding of programs

Author: uncomputable

src/core/commit.rs

@@ -13,14 +13,15 @@
 // If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //
 
+use crate::bititer::BitIter;
 use crate::core::iter::DagIterable;
 use crate::core::node::NodeInner;
 use crate::core::{Node, Value};
 use crate::decode::WitnessIterator;
 use crate::jet::{Application, JetNode};
 use crate::merkle::cmr::Cmr;
 use crate::merkle::{cmr, imr};
-use crate::{analysis, impl_ref_wrapper, inference, Error};
+use crate::{analysis, decode, impl_ref_wrapper, inference, Error};
 use std::collections::HashMap;
 use std::rc::Rc;
 
@@ -440,6 +441,13 @@ impl<Witness, App: Application> CommitNode<Witness, App> {
     }
 }
 
+impl<App: Application> CommitNode<(), App> {
+    /// Decode a Simplicity program from bits.
+    pub fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<Rc<Self>, Error> {
+        decode::decode_program_no_witness(bits)
+    }
+}
+
 /// Wrapper of references to [`CommitNode`].
 #[derive(Debug)]
 pub struct RefWrapper<'a, Witness, App: Application>(pub &'a CommitNode<Witness, App>);

src/core/node.rs

@@ -12,11 +12,14 @@
 // If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 //
 
+use crate::bititer::BitIter;
 use crate::core::types::Type;
-use crate::impl_ref_wrapper;
+use crate::core::{CommitNode, Value};
+use crate::decode::WitnessDecoder;
 use crate::jet::{Application, JetNode};
 use crate::merkle::cmr::Cmr;
 use crate::merkle::imr::Imr;
+use crate::{impl_ref_wrapper, Error};
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -144,6 +147,15 @@ impl<Witness, App: Application> Node<Witness, App> {
     }
 }
 
+impl<App: Application> Node<Value, App> {
+    /// Decode a Simplicity program from bits.
+    pub fn decode<I: Iterator<Item = u8>>(bits: &mut BitIter<I>) -> Result<Rc<Self>, Error> {
+        let commit = CommitNode::decode(bits).expect("decode program");
+        let witness = WitnessDecoder::new(bits).expect("decode witness");
+        commit.finalize(witness)
+    }
+}
+
 /// Wrapper of references to [`Node`].
 #[derive(Debug)]
 pub struct RefWrapper<'a, Witness, App: Application>(pub &'a Node<Witness, App>);