Skip to content

Commit ab5583d

Browse files
stefan-mystenDaughterOfMars
authored andcommitted
sui-graphql-client: return Result<Page> instead of Result<Option<Page>> (iotaledger#44)
1 parent ec1101d commit ab5583d

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

crates/sui-graphql-client/src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,7 @@ impl Client {
735735
&self,
736736
address: Address,
737737
pagination_filter: PaginationFilter<'a>,
738-
) -> Result<Option<Page<DynamicFieldOutput>>, Error> {
738+
) -> Result<Page<DynamicFieldOutput>, Error> {
739739
let (after, before, first, last) = self.pagination_filter(pagination_filter);
740740
let operation = DynamicFieldsOwnerQuery::build(DynamicFieldConnectionArgs {
741741
address,
@@ -751,18 +751,18 @@ impl Client {
751751
}
752752

753753
let Some(DynamicFieldsOwnerQuery { owner: Some(dfs) }) = response.data else {
754-
return Ok(Some(Page::new_empty()));
754+
return Ok(Page::new_empty());
755755
};
756756

757-
Ok(Some(Page::new(
757+
Ok(Page::new(
758758
dfs.dynamic_fields.page_info,
759759
dfs.dynamic_fields
760760
.nodes
761761
.into_iter()
762762
.map(TryInto::try_into)
763763
.collect::<Result<Vec<_>, Error>>()
764764
.map_err(|e| Error::msg(format!("{:?}", e)))?,
765-
)))
765+
))
766766
}
767767

768768
// ===========================================================================

crates/sui-graphql-client/src/query_types/dynamic_fields.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -184,18 +184,3 @@ impl TryFrom<DynamicField> for DynamicFieldOutput {
184184
})
185185
}
186186
}
187-
188-
// impl From<DynamicField> for DynamicFieldOutput {
189-
// fn from(val: DynamicField) -> DynamicFieldOutput {
190-
// DynamicFieldOutput {
191-
// name: crate::DynamicFieldName {
192-
// type_: TypeTag::from_str(val.name.as_ref().unwrap().type_.as_str()),
193-
// bcs: base64ct::Base64::decode_vec(val.name.as_ref().unwrap().bcs.0.as_ref())
194-
// .unwrap(),
195-
// json: val.name.as_ref().unwrap().json.clone(),
196-
// },
197-
// value_as_json: val.field_value_json(),
198-
// value: val.value.and_then(|x| x.type_bcs()),
199-
// }
200-
// }
201-
// }

0 commit comments

Comments
 (0)