Skip to content

Commit

Permalink
Integrate block production and the new trigger system (#712)
Browse files Browse the repository at this point in the history
* WIP: Use the new trigger instead of manual GQL block production

* Manually merge from Voxelots multi-tx-blocks branch

* Merge multi-tx-blocks branch

* Fix test in CI

* Fix all tests with `submit`

* working through txpool test failures

* fix more tests, move away from setup_tx

* investigate why dependency results are different

* mostly works

* some cleanup

* add missing gas prices to fix last test

* fix clippy

* Fix test

* Fix build

* goodbye submit_txs

* eliminate built-in timeout, let caller use their own timeout mechanism

* warnings cleanup

* Enable test `block_producer`

* Minor changes to improve naming=)

* Removed redundant `consensus_params` from `TxPoolConfig`.
Fixed `block_producer` test for futures testing to use right config in the TxPool.

* Fix "cargo make check --locked"

Co-authored-by: Brandon Kite <brandonkite92@gmail.com>
Co-authored-by: green <xgreenx9999@gmail.com>
  • Loading branch information
3 people authored and MujkicA committed Oct 26, 2022
1 parent c9baf7c commit 2b3daa9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 6 additions & 0 deletions fuel-core/src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ pub struct Command {
#[clap(long = "min-gas-price", default_value = "0")]
pub min_gas_price: u64,

<<<<<<< HEAD
/// The signing key used when producing blocks.
/// Setting via the `CONSENSUS_KEY_SECRET` ENV var is preferred.
#[clap(long = "consensus-key")]
Expand All @@ -89,6 +90,8 @@ pub struct Command {
#[clap(long = "dev-keys", default_value = "true")]
pub consensus_dev_key: bool,

=======
>>>>>>> a83268d (Integrate block production and the new trigger system (#712))
#[cfg(feature = "relayer")]
#[clap(flatten)]
pub relayer_args: relayer::RelayerArgs,
Expand All @@ -110,8 +113,11 @@ impl Command {
manual_blocks_enabled,
utxo_validation,
min_gas_price,
<<<<<<< HEAD
consensus_key,
consensus_dev_key,
=======
>>>>>>> a83268d (Integrate block production and the new trigger system (#712))
#[cfg(feature = "relayer")]
relayer_args,
#[cfg(feature = "p2p")]
Expand Down
3 changes: 1 addition & 2 deletions fuel-tests/tests/blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ async fn produce_block_negative() {
);

let tx = fuel_tx::Transaction::default();

client.submit(&tx).await.unwrap();
client.submit_and_await_commit(&tx).await.unwrap();

let transaction_response = client
.transaction(&format!("{:#x}", tx.id()))
Expand Down

0 comments on commit 2b3daa9

Please sign in to comment.