Skip to content
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.

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

Sf/block stream future03 #2679

Merged
merged 12 commits into from
Aug 11, 2021

Conversation

jubeless
Copy link
Contributor

@jubeless jubeless commented Aug 2, 2021

  • Attempt to upgrade tokio to 1.9 By doing so it would give us the flexibility to upgrade ethabi library as well as tokio-retry library.
  • Modified blockstream implementation to support future 0.3
  • Modified cancellable to support future 0.3
  • Modified retry lib to support future 0.3. Now retry func expects a future 0.3 function
  • Sprinkled some boxed & compat where needed
  • Fixed examples

Copy link
Collaborator

@leoyvens leoyvens left a comment

Choose a reason for hiding this comment

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

I tried this out in hosted and it is working wonders, I have a few small comments, and then this is ready to merge after a rebase.

graph/Cargo.toml Outdated Show resolved Hide resolved
graph/Cargo.toml Outdated Show resolved Hide resolved
graphql/tests/query.rs Outdated Show resolved Hide resolved
graph/src/blockchain/block_stream.rs Outdated Show resolved Hide resolved
@jubeless
Copy link
Contributor Author

@leoyvens Rebased and fixed the comments! lets get another workflow going

This reverts commit a32d631.

# Conflicts:
#	Cargo.lock
#	chain/ethereum/src/block_ingestor.rs
#	chain/ethereum/tests/network_indexer.rs
#	core/src/subgraph/instance_manager.rs
#	graph/Cargo.toml
#	graph/src/data/graphql/effort.rs
#	graph/src/util/futures.rs
#	graphql/src/execution/execution.rs
#	graphql/tests/query.rs
#	runtime/test/src/test/abi.rs
#	runtime/wasm/Cargo.toml
#	runtime/wasm/src/host_exports.rs
#	runtime/wasm/src/mapping.rs
#	runtime/wasm/src/module/test.rs
#	store/postgres/src/chain_head_listener.rs
#	store/postgres/tests/graft.rs
#	store/test-store/src/store.rs
- Modified blockstream implementation to support future 0.3
- Modified cancellable to support future 0.3
- Modified `retry` lib to support future 0.3. Now retry func expects a future 0.3 function
- Sprinkled some `boxed` & `compat` where needed
- Fixed exemples
@leoyvens leoyvens merged commit bc26b36 into graphprotocol:master Aug 11, 2021
@maoueh maoueh deleted the sf/block_stream_future03 branch August 11, 2021 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants