Skip to content

Fix nightly for introduction of built-in never type #1228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2019
Merged

Fix nightly for introduction of built-in never type #1228

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions jormungandr/src/explorer/graphql/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,13 @@ impl Block {
}

fn get_explorer_block(&self, db: &ExplorerDB) -> FieldResult<ExplorerBlock> {
db.get_block(&self.hash).wait()?.ok_or(
ErrorKind::InternalError("Couldn't find block's contents in explorer".to_owned())
.into(),
)
db.get_block(&self.hash)
.wait()
.unwrap_or_else(|e| match e {})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be replaced by .into_ok() when that is stabilized: rust-lang/rust#66045

.ok_or(
ErrorKind::InternalError("Couldn't find block's contents in explorer".to_owned())
.into(),
)
}
}

Expand Down Expand Up @@ -283,12 +286,17 @@ impl Transaction {
))?,
};

context.db.get_block(&block_id).wait()?.ok_or(
ErrorKind::InternalError(
"transaction is in explorer but couldn't find its block".to_owned(),
context
.db
.get_block(&block_id)
.wait()
.unwrap_or_else(|e| match e {})
.ok_or(
ErrorKind::InternalError(
"transaction is in explorer but couldn't find its block".to_owned(),
)
.into(),
)
.into(),
)
}

fn get_contents(&self, context: &Context) -> FieldResult<ExplorerTransaction> {
Expand Down Expand Up @@ -444,7 +452,8 @@ impl Address {
let transactions = context
.db
.get_transactions_by_address(&self.id)
.wait()?
.wait()
.unwrap_or_else(|e| match e {})
.unwrap_or(PersistentSequence::<FragmentId>::new());

let boundaries = if transactions.len() > 0 {
Expand Down Expand Up @@ -909,7 +918,8 @@ impl Status {
.db
.get_latest_block_hash()
.and_then(|hash| context.db.get_block(&hash))
.wait()?
.wait()
.unwrap_or_else(|e| match e {})
.ok_or(ErrorKind::InternalError("tip is not in explorer".to_owned()).into())
.map(|b| Block::from(&b))
}
Expand Down Expand Up @@ -1008,13 +1018,15 @@ impl Epoch {
.db
.get_block(&epoch_data.first_block)
.map(|block| u32::from(block.expect("The block to be indexed").chain_length))
.wait()?;
.wait()
.unwrap_or_else(|e| match e {});

let epoch_upper_bound = context
.db
.get_block(&epoch_data.last_block)
.map(|block| u32::from(block.expect("The block to be indexed").chain_length))
.wait()?;
.wait()
.unwrap_or_else(|e| match e {});

let boundaries = PaginationInterval::Inclusive(InclusivePaginationInterval {
lower_bound: 0,
Expand Down Expand Up @@ -1110,7 +1122,8 @@ impl Query {
Ok(context
.db
.find_block_by_chain_length(length.try_into()?)
.wait()?
.wait()
.unwrap_or_else(|e| match e {})
.map(Block::from_valid_hash))
}

Expand All @@ -1127,7 +1140,8 @@ impl Query {
.db
.get_latest_block_hash()
.and_then(|hash| context.db.get_block(&hash))
.wait()?
.wait()
.unwrap_or_else(|e| match e {})
.ok_or(ErrorKind::InternalError(
"tip is not in explorer".to_owned(),
))
Expand Down