diff --git a/src/lib.rs b/src/lib.rs index 2bf3129..7b900d2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,11 +1,8 @@ // Find all our documentation at https://docs.near.org -use near_sdk::borsh::{BorshDeserialize, BorshSerialize}; -use near_sdk::json_types::U128; -use near_sdk::serde::{Deserialize, Serialize}; use near_sdk::{ - assert_one_yocto, env, log, near, near_bindgen, require, AccountId, PanicOnDefault, + assert_one_yocto, env, json_types::U128, log, near, near_bindgen, require, AccountId, + PanicOnDefault, }; -use schemars::JsonSchema; use uint::construct_uint; construct_uint! { @@ -13,8 +10,7 @@ construct_uint! { pub struct U256(4); } -#[derive(Deserialize, Serialize, JsonSchema)] -#[serde(crate = "near_sdk::serde")] +#[near(serializers = [json, borsh])] pub struct BasicReturnObject { pub greeting: String, pub number: u8, @@ -30,8 +26,8 @@ pub(crate) fn proportional(amount: u128, numerator: u128, denominator: u128) -> } // Define the contract structure -#[near_bindgen] -#[derive(BorshDeserialize, BorshSerialize, PanicOnDefault)] +#[near(contract_state)] +#[derive(PanicOnDefault)] pub struct NearTutorialContract { greeting: String, } @@ -155,10 +151,7 @@ impl NearTutorialContract { */ #[cfg(test)] mod tests { - use near_sdk::{ - test_utils::{accounts, VMContextBuilder}, - testing_env, NearToken, - }; + use near_sdk::{test_utils::VMContextBuilder, testing_env, NearToken}; use super::*;