Skip to content

Commit

Permalink
feat: add token_series_id in output
Browse files Browse the repository at this point in the history
  • Loading branch information
emarai committed Aug 28, 2021
1 parent 03e3b90 commit 11eddd2
Showing 1 changed file with 12 additions and 2 deletions.
14 changes: 12 additions & 2 deletions contract/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pub struct TokenSeries {
#[derive(Serialize, Deserialize)]
#[serde(crate = "near_sdk::serde")]
pub struct TokenSeriesJson {
token_series_id: TokenSeriesId,
metadata: TokenMetadata,
creator_id: AccountId,
royalty: HashMap<AccountId, u32>
Expand Down Expand Up @@ -115,7 +116,7 @@ impl Contract {
creator_id: ValidAccountId,
price: Option<U128>,
royalty: Option<HashMap<AccountId, u32>>,
) {
) -> TokenSeriesJson {
let initial_storage_usage = env::storage_usage();
let owner_id = env::predecessor_account_id();
assert_eq!(
Expand Down Expand Up @@ -184,6 +185,13 @@ impl Contract {
);

refund_deposit(env::storage_usage() - initial_storage_usage, 0);

TokenSeriesJson{
token_series_id: token_series_id,
metadata: token_metadata,
creator_id: creator_id.into(),
royalty: royalty_res,
}
}

#[payable]
Expand Down Expand Up @@ -394,6 +402,7 @@ impl Contract {
pub fn nft_get_series_single(&self, token_series_id: TokenSeriesId) -> TokenSeriesJson {
let token_series = self.token_series_by_id.get(&token_series_id).expect("Series does not exist");
TokenSeriesJson{
token_series_id: token_series_id,
metadata: token_series.metadata,
creator_id: token_series.creator_id,
royalty: token_series.royalty,
Expand Down Expand Up @@ -425,7 +434,8 @@ impl Contract {
.iter()
.skip(start_index as usize)
.take(limit)
.map(|(_, token_series)| TokenSeriesJson{
.map(|(token_series_id, token_series)| TokenSeriesJson{
token_series_id: token_series_id,
metadata: token_series.metadata,
creator_id: token_series.creator_id,
royalty: token_series.royalty,
Expand Down

0 comments on commit 11eddd2

Please sign in to comment.