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.

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

Make transaction status stream work #1108

Merged
merged 11 commits into from
May 29, 2023
Merged

Make transaction status stream work #1108

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2a83b7a
make transaction status stream work
freesig Apr 6, 2023
941a92b
fix cargo toml, add comments
freesig Apr 6, 2023
b7ae545
Merge branch 'master' of github.com:FuelLabs/fuel-core into freesig/t…
freesig Apr 25, 2023
ee6d387
Merge branch 'master' into freesig/test-submit-await
xgreenx May 25, 2023
6484c1a
Fix compilation issues
xgreenx May 25, 2023
4ff5806
Remove useless `TxStatus`
leviathanbeak May 26, 2023
bccfb85
Fix the sync test to wait for block commit
xgreenx May 26, 2023
4f516e6
Merge branch 'master' into freesig/test-submit-await
xgreenx May 26, 2023
9fff7b7
Simplify requirements to the DB
xgreenx May 26, 2023
b1f7488
Merge remote-tracking branch 'origin/freesig/test-submit-await' into …
xgreenx May 26, 2023
d5ec1c3
Configurable number of subscriptions
xgreenx May 26, 2023
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
161 changes: 143 additions & 18 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,8 @@ serde_json = "1.0"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "cookies"] }
mockall = "0.11"
test-case = "2.2"
test-strategy = "0.3"
proptest = "1.1"
axum = "0.5"
lazy_static = "1.4"
once_cell = "1.16"
Expand Down
2 changes: 2 additions & 0 deletions crates/fuel-core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ fuel-core-storage = { path = "./../storage", features = ["test-helpers"] }
fuel-core-trace = { path = "./../trace" }
fuel-core-types = { path = "./../types", features = ["test-helpers"] }
mockall = { workspace = true }
proptest = { workspace = true }
test-case = { workspace = true }
test-strategy = { workspace = true }

[features]
dap = ["dep:uuid"]
Expand Down
11 changes: 7 additions & 4 deletions crates/fuel-core/src/graphql_api/ports.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use async_trait::async_trait;
use fuel_core_services::stream::BoxStream;
use fuel_core_services::stream::{
BoxFuture,
BoxStream,
};
use fuel_core_storage::{
iter::{
BoxedIter,
Expand All @@ -21,7 +24,7 @@ use fuel_core_storage::{
Result as StorageResult,
StorageInspect,
};
use fuel_core_txpool::service::TxUpdate;
use fuel_core_txpool::service::TxStatusMessage;
use fuel_core_types::{
blockchain::primitives::{
BlockId,
Expand Down Expand Up @@ -55,7 +58,6 @@ use fuel_core_types::{
tai64::Tai64,
};
use std::sync::Arc;
use tokio_stream::wrappers::errors::BroadcastStreamRecvError;

/// The database port expected by GraphQL API service.
pub trait DatabasePort:
Expand Down Expand Up @@ -161,7 +163,8 @@ pub trait TxPoolPort: Send + Sync {

fn tx_update_subscribe(
&self,
) -> BoxStream<anyhow::Result<TxUpdate, BroadcastStreamRecvError>>;
tx_id: TxId,
) -> BoxFuture<'_, BoxStream<TxStatusMessage>>;
}

#[async_trait]
Expand Down
Loading