Skip to content

Commit

Permalink
Merge pull request #730 from FuelLabs/braqzen-bump
Browse files Browse the repository at this point in the history
  • Loading branch information
Braqzen authored Aug 18, 2023
2 parents 47c64d7 + 110abe9 commit 718316e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .docs/contributing-book/src/code/Forc.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ dependencies = ['std']

[[package]]
name = 'core'
source = 'path+from-root-9BFE6D5D0CBDF740'
source = 'path+from-root-EB296BD18C0E4CC4'

[[package]]
name = 'std'
source = 'git+https://github.com/fuellabs/sway?tag=v0.42.1#3b66f8e424bd21e3ba467783b10b36e808cfa6ee'
source = 'git+https://github.com/fuellabs/sway?tag=v0.44.1#04a597093e7441898933dd412b8e4dc6ac860cd3'
dependencies = ['core']
6 changes: 3 additions & 3 deletions .docs/contributing-book/src/code/fuel-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[toolchain]
channel = "latest-2023-07-07"
channel = "latest-2023-08-16"

[components]
forc = "0.42.1"
fuel-core = "0.18.3"
forc = "0.44.1"
fuel-core = "0.20.4"
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:
cancel-in-progress: true

env:
RUST_VERSION: 1.70.0
RUST_VERSION: 1.71.1

jobs:
lint-toml-files:
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
uses: FuelLabs/[email protected]
with:
toolchain: latest
date: 2023-07-07
date: 2023-08-16

- name: Check Sway formatting
run: |
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
uses: FuelLabs/[email protected]
with:
toolchain: latest
date: 2023-07-07
date: 2023-08-16

- name: Check Sway formatting
run: forc fmt --check --path ${{ matrix.project }}
Expand Down
15 changes: 5 additions & 10 deletions oracle/project/oracle-node/tests/functions/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::functions::{HardcodedPriceProvider, LoggingPriceUpdater};
use fuels::tx::Receipt;
use itertools::Itertools;
use oracle_node::spawn_oracle_updater_job;
use std::{borrow::Borrow, time::Duration};
use std::time::Duration;

mod success {
use super::*;
Expand All @@ -26,7 +26,6 @@ mod success {
assert!(invocations
.lock()
.await
.borrow()
.iter()
.all(|invocation| { invocation.price == the_price }));
}
Expand All @@ -42,15 +41,11 @@ mod success {

tokio::time::sleep(period * 3).await;

assert!(invocations
.lock()
.await
.borrow()
.iter()
.tuple_windows()
.all(|(previous_invocation, current_invocation)| {
assert!(invocations.lock().await.iter().tuple_windows().all(
|(previous_invocation, current_invocation)| {
current_invocation.time - previous_invocation.time >= period
}));
}
));
}

#[tokio::test]
Expand Down

0 comments on commit 718316e

Please sign in to comment.