move value module to the root;

ergoplatform · Nov 12, 2020 · 3b2f72c · 3b2f72c
1 parent f86276e
commit 3b2f72c
Show file tree

Hide file tree

Showing 24 changed files with 46 additions and 47 deletions.
diff --git a/bindings/ergo-lib-wasm/src/ergo_box.rs b/bindings/ergo-lib-wasm/src/ergo_box.rs
@@ -22,8 +22,8 @@ use chain::ergo_box::NonMandatoryRegisters;
 use ergo_lib::chain;
 use wasm_bindgen::prelude::*;
 
-use crate::ast::Value;
 use crate::utils::I64;
+use crate::value::Value;
 use crate::{contract::Contract, transaction::TxId};
 
 pub mod box_builder;

diff --git a/bindings/ergo-lib-wasm/src/ergo_box/box_builder.rs b/bindings/ergo-lib-wasm/src/ergo_box/box_builder.rs
@@ -2,11 +2,11 @@
 use ergo_lib::chain;
 use wasm_bindgen::prelude::*;
 
-use crate::ast::Value;
 use crate::contract::Contract;
 use crate::token::Token;
 use crate::token::TokenAmount;
 use crate::token::TokenId;
+use crate::value::Value;
 
 use super::BoxValue;
 use super::ErgoBoxCandidate;

diff --git a/bindings/ergo-lib-wasm/src/lib.rs b/bindings/ergo-lib-wasm/src/lib.rs
@@ -15,7 +15,6 @@
 #![allow(clippy::len_without_is_empty)]
 
 pub mod address;
-pub mod ast;
 pub mod box_coll;
 pub mod box_selector;
 pub mod contract;
@@ -28,4 +27,5 @@ pub mod token;
 pub mod transaction;
 pub mod tx_builder;
 pub mod utils;
+pub mod value;
 pub mod wallet;
diff --git a/bindings/ergo-lib-wasm/src/ast.rs → bindings/ergo-lib-wasm/src/value.rs b/bindings/ergo-lib-wasm/src/ast.rs → bindings/ergo-lib-wasm/src/value.rs
@@ -6,12 +6,12 @@ use js_sys::Uint8Array;
 use wasm_bindgen::prelude::*;
 
 use crate::utils::I64;
-use ergo_lib::TryExtractFrom;
+use ergo_lib::value::TryExtractFrom;
 
 /// Ergo constant(evaluated) values
 #[wasm_bindgen]
 #[derive(PartialEq, Eq, Debug, Clone)]
-pub struct Value(ergo_lib::Value);
+pub struct Value(ergo_lib::value::Value);
 
 #[wasm_bindgen]
 impl Value {
@@ -24,7 +24,7 @@ impl Value {
                     base16_bytes_str.clone()
                 ))
             })?;
-        ergo_lib::Value::try_from(bytes)
+        ergo_lib::value::Value::try_from(bytes)
             .map_err(|e| JsValue::from_str(&format! {"{:?}", e}))
             .map(Value)
     }
@@ -69,13 +69,13 @@ impl Value {
     }
 }
 
-impl From<ergo_lib::Value> for Value {
-    fn from(c: ergo_lib::Value) -> Self {
+impl From<ergo_lib::value::Value> for Value {
+    fn from(c: ergo_lib::value::Value) -> Self {
         Value(c)
     }
 }
 
-impl From<Value> for ergo_lib::Value {
+impl From<Value> for ergo_lib::value::Value {
     fn from(c: Value) -> Self {
         c.0
     }

diff --git a/ergo-lib/src/ast.rs b/ergo-lib/src/ast.rs
@@ -2,15 +2,14 @@
 use crate::eval::cost_accum::CostAccumulator;
 use crate::eval::EvalError;
 use crate::eval::Evaluable;
+use crate::value::Value;
 use crate::{serialization::op_code::OpCode, types::*};
 use core::fmt;
 
 mod constant_placeholder;
 mod ops;
-pub(crate) mod value;
 
 pub(crate) use constant_placeholder::*;
-pub(crate) use value::*;
 
 #[derive(PartialEq, Eq, Debug, Clone)]
 /// newtype for box register id

diff --git a/ergo-lib/src/chain/address.rs b/ergo-lib/src/chain/address.rs
@@ -1,8 +1,10 @@
 //! Address types
 
 use super::digest32;
+use crate::value::RawValue;
+use crate::value::Value;
 use crate::{
-    ast::{Expr, RawValue, Value},
+    ast::Expr,
     ergo_tree::{ErgoTree, ErgoTreeParsingError},
     serialization::{SerializationError, SigmaSerializable},
     sigma_protocol::{

diff --git a/ergo-lib/src/chain/ergo_box/box_builder.rs b/ergo-lib/src/chain/ergo_box/box_builder.rs
@@ -3,7 +3,7 @@
 use std::collections::HashMap;
 use std::convert::{TryFrom, TryInto};
 
-use crate::ast::Value;
+use crate::value::Value;
 use crate::chain::token::Token;
 use crate::ergo_tree::ErgoTree;
 use crate::serialization::SigmaSerializable;

diff --git a/ergo-lib/src/chain/ergo_box/register.rs b/ergo-lib/src/chain/ergo_box/register.rs
@@ -1,6 +1,6 @@
 //! Box registers
 
-use crate::{ast::Value, serialization::SerializationError};
+use crate::{value::Value, serialization::SerializationError};
 #[cfg(feature = "json")]
 use serde::{Deserialize, Serialize};
 use std::{collections::HashMap, convert::TryFrom};

diff --git a/ergo-lib/src/ergo_tree.rs b/ergo-lib/src/ergo_tree.rs
@@ -4,10 +4,8 @@ use crate::serialization::{
     sigma_byte_writer::{SigmaByteWrite, SigmaByteWriter},
     SerializationError, SigmaSerializable,
 };
-use crate::{
-    ast::{Expr, Value},
-    types::SType,
-};
+use crate::value::Value;
+use crate::{ast::Expr, types::SType};
 use io::{Cursor, Read};
 
 use crate::serialization::constant_store::ConstantStore;
@@ -255,7 +253,7 @@ impl SigmaSerializable for ErgoTree {
 mod tests {
     use super::*;
     use crate::serialization::sigma_serialize_roundtrip;
-    use crate::{ast::RawValue, chain, sigma_protocol::sigma_boolean::SigmaProp, types::SType};
+    use crate::{chain, sigma_protocol::sigma_boolean::SigmaProp, types::SType, value::RawValue};
     use proptest::prelude::*;
 
     impl Arbitrary for ErgoTree {

diff --git a/ergo-lib/src/eval.rs b/ergo-lib/src/eval.rs
@@ -1,9 +1,7 @@
 //! Interpreter
-use crate::{
-    ast::{Expr, RawValue, Value},
-    sigma_protocol::sigma_boolean::SigmaBoolean,
-    types::SType,
-};
+use crate::value::RawValue;
+use crate::value::Value;
+use crate::{ast::Expr, sigma_protocol::sigma_boolean::SigmaBoolean, types::SType};
 
 use cost_accum::CostAccumulator;
 use thiserror::Error;
@@ -117,7 +115,7 @@ fn eval(
 #[cfg(test)]
 mod tests {
     use crate::ast::ContextMethods;
-    use crate::ast::TryExtractFrom;
+    use crate::value::TryExtractFrom;
 
     use super::*;
 

diff --git a/ergo-lib/src/eval/context.rs b/ergo-lib/src/eval/context.rs
@@ -1,5 +1,5 @@
-use crate::ast::Value;
 use crate::chain::ergo_state_context::ErgoStateContext;
+use crate::value::Value;
 use crate::wallet::signing::TransactionContext;
 
 #[derive(PartialEq, Eq, Debug, Clone)]

diff --git a/ergo-lib/src/lib.rs b/ergo-lib/src/lib.rs
@@ -12,18 +12,17 @@
 // Clippy exclusions
 #![allow(clippy::unit_arg)]
 
-pub(crate) mod ast;
+mod ast;
 mod big_integer;
 mod constants;
 mod eval;
 mod types;
 
-pub use ast::value::*;
-
 pub mod chain;
 pub mod serialization;
 pub mod sigma_protocol;
 pub mod util;
+pub mod value;
 pub mod wallet;
 
 pub mod ergo_tree;

diff --git a/ergo-lib/src/serialization.rs b/ergo-lib/src/serialization.rs
@@ -1,11 +1,11 @@
 //! Serializers
 
-mod constant;
 mod constant_placeholder;
 mod data;
 mod expr;
 mod fold;
 mod sigmaboolean;
+mod value;
 
 pub(crate) mod constant_store;
 pub(crate) mod ergo_box;

diff --git a/ergo-lib/src/serialization/constant_placeholder.rs b/ergo-lib/src/serialization/constant_placeholder.rs
@@ -32,7 +32,7 @@ mod tests {
             constant_store::ConstantStore, sigma_byte_reader::SigmaByteReader,
             sigma_byte_writer::SigmaByteWriter,
         },
-        Value,
+        value::Value,
     };
     use io::Cursor;
     use proptest::prelude::*;

diff --git a/ergo-lib/src/serialization/constant_store.rs b/ergo-lib/src/serialization/constant_store.rs
@@ -1,6 +1,7 @@
 //! Constant store for Sigma byte reader
 
-use crate::ast::{ConstantPlaceholder, Value};
+use crate::ast::ConstantPlaceholder;
+use crate::value::Value;
 
 /// Storage for constants used in ErgoTree constant segregation
 pub struct ConstantStore {
@@ -42,7 +43,7 @@ impl ConstantStore {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{ast::RawValue, types::SType};
+    use crate::{types::SType, value::RawValue};
 
     #[test]
     fn test_empty() {

diff --git a/ergo-lib/src/serialization/data.rs b/ergo-lib/src/serialization/data.rs
@@ -3,9 +3,9 @@ use crate::serialization::{
 };
 use crate::util::AsVecU8;
 use crate::{
-    ast::RawValue,
-    ast::RawValue::*,
-    ast::{Coll, CollPrim},
+    value::RawValue,
+    value::RawValue::*,
+    value::{Coll, CollPrim},
     sigma_protocol,
     types::SType,
     types::SType::*,

diff --git a/ergo-lib/src/serialization/ergo_box.rs b/ergo-lib/src/serialization/ergo_box.rs
@@ -1,6 +1,6 @@
 //! ErgoBox and ErgoBoxCandidate serialization
 use crate::{
-    ast::Value,
+    value::Value,
     chain::{
         ergo_box::{BoxValue, ErgoBoxCandidate, NonMandatoryRegisters},
         token::{Token, TokenId},

diff --git a/ergo-lib/src/serialization/expr.rs b/ergo-lib/src/serialization/expr.rs
@@ -3,7 +3,7 @@ use crate::ast::{CollMethods, ConstantPlaceholder, Expr};
 use crate::serialization::{
     sigma_byte_reader::SigmaByteRead, SerializationError, SigmaSerializable,
 };
-use crate::Value;
+use crate::value::Value;
 
 use std::io;
 

diff --git a/ergo-lib/src/serialization/constant.rs → ergo-lib/src/serialization/value.rs b/ergo-lib/src/serialization/constant.rs → ergo-lib/src/serialization/value.rs
@@ -2,7 +2,8 @@ use super::{data::DataSerializer, sigma_byte_writer::SigmaByteWrite};
 use crate::serialization::{
     sigma_byte_reader::SigmaByteRead, SerializationError, SigmaSerializable,
 };
-use crate::{types::SType, Value};
+use crate::types::SType;
+use crate::value::Value;
 
 use std::io;
 

diff --git a/ergo-lib/src/sigma_protocol/prover.rs b/ergo-lib/src/sigma_protocol/prover.rs
@@ -300,11 +300,8 @@ impl Prover for TestProver {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{
-        ast::{Expr, RawValue, Value},
-        sigma_protocol::private_input::DlogProverInput,
-        types::SType,
-    };
+    use crate::value::{RawValue, Value};
+    use crate::{ast::Expr, sigma_protocol::private_input::DlogProverInput, types::SType};
     use std::rc::Rc;
 
     #[test]

diff --git a/ergo-lib/src/sigma_protocol/prover/context_extension.rs b/ergo-lib/src/sigma_protocol/prover/context_extension.rs
@@ -1,6 +1,6 @@
 //! ContextExtension type
 use crate::{
-    ast::Value,
+    value::Value,
     serialization::{
         sigma_byte_reader::SigmaByteRead, sigma_byte_writer::SigmaByteWrite, SerializationError,
         SigmaSerializable,

diff --git a/ergo-lib/src/sigma_protocol/verifier.rs b/ergo-lib/src/sigma_protocol/verifier.rs
@@ -120,12 +120,13 @@ impl Verifier for TestVerifier {}
 mod tests {
     use super::*;
     use crate::{
-        ast::{Expr, Value},
+        ast::Expr,
         sigma_protocol::{
             private_input::{DlogProverInput, PrivateInput},
             prover::{Prover, TestProver},
         },
         types::SType,
+        value::Value,
     };
     use proptest::prelude::*;
     use std::rc::Rc;

diff --git a/ergo-lib/src/ast/value.rs → ergo-lib/src/value.rs b/ergo-lib/src/ast/value.rs → ergo-lib/src/value.rs
@@ -1,3 +1,5 @@
+//! Value (non-reducable data values)
+
 use crate::chain::{Base16DecodedBytes, Base16EncodedBytes};
 use crate::{
     chain::ergo_box::ErgoBox,

diff --git a/ergo-lib/src/wallet/signing.rs b/ergo-lib/src/wallet/signing.rs
@@ -84,8 +84,9 @@ mod tests {
     use proptest::collection::vec;
     use proptest::prelude::*;
 
+    use crate::value::Value;
     use crate::{
-        ast::{Expr, Value},
+        ast::Expr,
         chain::{
             ergo_box::{box_builder::ErgoBoxCandidateBuilder, BoxValue, NonMandatoryRegisters},
             transaction::{TxId, UnsignedInput},