fix borshschema

near-sdk/src/collections/lazy_option.rs

@@ -9,11 +9,22 @@ use borsh::{to_vec, BorshDeserialize, BorshSerialize};
 
 use crate::env;
 use crate::IntoStorageKey;
+#[cfg(feature = "abi")]
+use borsh::BorshSchema;
 
 const ERR_VALUE_SERIALIZATION: &str = "Cannot serialize value with Borsh";
 const ERR_VALUE_DESERIALIZATION: &str = "Cannot deserialize value with Borsh";
 
 /// An persistent lazy option, that stores a value in the storage.
+#[cfg(feature = "abi")]
+#[derive(BorshSerialize, BorshDeserialize, BorshSchema)]
+pub struct LazyOption<T> {
+    storage_key: Vec<u8>,
+    #[borsh(skip)]
+    el: PhantomData<T>,
+}
+
+#[cfg(not(feature = "abi"))]
 #[derive(BorshSerialize, BorshDeserialize)]
 pub struct LazyOption<T> {
     storage_key: Vec<u8>,

near-sdk/src/collections/lookup_map.rs

@@ -6,7 +6,6 @@ use std::marker::PhantomData;
 #[cfg(feature = "abi")]
 use borsh::BorshSchema;
 use borsh::{to_vec, BorshDeserialize, BorshSerialize};
-use near_sdk_macros::NearSchema;
 
 use crate::collections::append_slice;
 use crate::{env, IntoStorageKey};
@@ -17,7 +16,16 @@ const ERR_VALUE_SERIALIZATION: &str = "Cannot serialize value with Borsh";
 
 /// An non-iterable implementation of a map that stores its content directly on the trie.
 
-#[derive(BorshSerialize, BorshDeserialize, NearSchema)]
+#[cfg(feature = "abi")]
+#[derive(BorshSerialize, BorshDeserialize, BorshSchema)]
+pub struct LookupMap<K, V> {
+    key_prefix: Vec<u8>,
+    #[borsh(skip)]
+    el: PhantomData<(K, V)>,
+}
+
+#[cfg(not(feature = "abi"))]
+#[derive(BorshSerialize, BorshDeserialize)]
 pub struct LookupMap<K, V> {
     key_prefix: Vec<u8>,
     #[borsh(skip)]

near-sdk/src/collections/tree_map.rs

@@ -1,5 +1,6 @@
 use borsh::{BorshDeserialize, BorshSerialize};
-use near_sdk_macros::NearSchema;
+#[cfg(feature = "abi")]
+use borsh::BorshSchema;
 use std::ops::Bound;
 
 use crate::collections::LookupMap;
@@ -15,7 +16,17 @@ use crate::{env, IntoStorageKey};
 /// - `above`/`below`:          O(log(N))
 /// - `range` of K elements:    O(Klog(N))
 ///
-#[derive(BorshSerialize, BorshDeserialize, NearSchema)]
+
+#[cfg(feature = "abi")]
+#[derive(BorshSerialize, BorshDeserialize, BorshSchema)]
+pub struct TreeMap<K, V> {
+    root: u64,
+    val: LookupMap<K, V>,
+    tree: Vector<Node<K>>,
+}
+
+#[cfg(not(feature = "abi"))]
+#[derive(BorshSerialize, BorshDeserialize)]
 pub struct TreeMap<K, V> {
     root: u64,
     val: LookupMap<K, V>,

near-sdk/src/collections/vector.rs

@@ -23,7 +23,17 @@ fn expect_consistent_state<T>(val: Option<T>) -> T {
 
 /// An iterable implementation of vector that stores its content on the trie.
 /// Uses the following map: index -> element.
-#[derive(BorshSerialize, BorshDeserialize, NearSchema)]
+#[cfg(feature = "abi")]
+#[derive(BorshSerialize, BorshDeserialize, BorshSchema)]
+pub struct Vector<T> {
+    len: u64,
+    prefix: Vec<u8>,
+    #[borsh(skip)]
+    el: PhantomData<T>,
+}
+
+#[cfg(not(feature = "abi"))]
+#[derive(BorshSerialize, BorshDeserialize)]
 pub struct Vector<T> {
     len: u64,
     prefix: Vec<u8>,

near-sdk/src/json_types/vector.rs

@@ -1,7 +1,14 @@
 use borsh::{BorshDeserialize, BorshSerialize};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+#[cfg(feature = "abi")]
+use borsh::BorshSchema;
 
 /// Helper class to serialize/deserialize `Vec<u8>` to base64 string.
+#[cfg(feature = "abi")]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize, BorshSerialize, BorshSchema)]
+pub struct Base64VecU8(#[serde(with = "base64_bytes")] pub Vec<u8>);
+
+#[cfg(not(feature = "abi"))]
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, BorshDeserialize, BorshSerialize)]
 pub struct Base64VecU8(#[serde(with = "base64_bytes")] pub Vec<u8>);