diff --git a/rust-toolchain.toml b/rust-toolchain.toml index d5834e2..48a576c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,7 +1,7 @@ [toolchain] # For deploy -channel = "1.81.0" +# channel = "1.81.0" # For develop and test -# channel = "stable" +channel = "stable" components = ["rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/src/lib.rs b/src/lib.rs index 86e5d76..ed5205a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,5 @@ // 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::{log, near, near_bindgen, require, PanicOnDefault}; -use schemars::JsonSchema; +use near_sdk::{json_types::U128, log, near, near_bindgen, require, PanicOnDefault}; use uint::construct_uint; construct_uint! { @@ -11,8 +7,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, @@ -28,8 +23,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, }