Merge branch 'main' into patch-1

centrifuge · Jan 17, 2025 · 88437bb · 88437bb
2 parents 36e31b7 + 6ca83c7
commit 88437bb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 6 deletions.
diff --git a/.github/actions/sccache-gcloud/action.yml b/.github/actions/sccache-gcloud/action.yml
@@ -31,7 +31,6 @@ runs:
         # echo "SCCACHE_GCS_KEY_PATH=${{ steps.gauth.credentials_file_path }}" >> $GITHUB_ENV        
 
     - name: setup Rust sccache wrapper
-      if: ${{ inputs.cache == 'enabled' }}
       shell: bash
       run: |
         echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV

diff --git a/.github/workflows/sanity-checks.yml b/.github/workflows/sanity-checks.yml
@@ -35,12 +35,19 @@ jobs:
       # Required for integration tests evm interaction
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
+
+      - name: Debug GitHub Environment Variables
+        shell: bash
+        run: |
+          echo "SCCACHE_GCS_BUCKET=${SCCACHE_GCS_BUCKET}"
+          echo "SCCACHE_GCS_RW_MODE=${SCCACHE_GCS_RW_MODE}"
+          echo "RUSTC_WRAPPER=${RUSTC_WRAPPER}"
+          echo "CARGO_INCREMENTAL=${CARGO_INCREMENTAL}"
 
       - name: Runing cargo ${{ matrix.target }}
         run: ./ci/run-check.sh
         env:
           TARGET: ${{ matrix.target }}
-          RUSTC_WRAPPER: "sccache"
 
   benchmark-check:
     if: ${{ !github.event.pull_request.draft }}
@@ -63,10 +70,16 @@ jobs:
           GWIP: ${{ secrets.GWIP_SCCACHE }}
           GSA: ${{ secrets.GSA_SCCACHE }}
 
+      - name: Debug GitHub Environment Variables
+        shell: bash
+        run: |
+          echo "SCCACHE_GCS_BUCKET=${SCCACHE_GCS_BUCKET}"
+          echo "SCCACHE_GCS_RW_MODE=${SCCACHE_GCS_RW_MODE}"
+          echo "RUSTC_WRAPPER=${RUSTC_WRAPPER}"
+          echo "CARGO_INCREMENTAL=${CARGO_INCREMENTAL}"
 
       - name: Runing cargo ${{ matrix.target }}
         run: ./ci/run-check.sh
         env:
           TARGET: benchmark-check
           RUNTIME: ${{ matrix.runtime }}
-          RUSTC_WRAPPER: "sccache"
diff --git a/ci/check_runtime_changes.sh b/ci/check_runtime_changes.sh
@@ -48,7 +48,7 @@ RUNTIME_FILE_CHANGED=$(echo "${CHANGED_FILES}" | grep -e ^runtime/ | wc -l)
 
 echo "There are ${RUNTIME_FILE_CHANGED} file(s) changed in runtime "
 
-# If there are no changes in the runtime file, exit sucessfully
+# If there are no changes in the runtime file, exit successfully
 if (( $RUNTIME_FILE_CHANGED == 0 ))
 then
 	echo -e "| ${OK} Nothing is changed in runtime"

diff --git a/pallets/liquidity-pools/src/lib.rs b/pallets/liquidity-pools/src/lib.rs
@@ -301,7 +301,7 @@ pub mod pallet {
 		/// The metadata of the given asset does not declare it as transferable
 		/// via LiquidityPools'.
 		AssetNotLiquidityPoolsTransferable,
-		/// The asset is not a a wrapped token and thus cannot be
+		/// The asset is not a wrapped token and thus cannot be
 		/// transferred via liquidity pools.
 		AssetNotLiquidityPoolsWrappedToken,
 		/// A pool could not be found.

diff --git a/pallets/pool-system/src/tranches.rs b/pallets/pool-system/src/tranches.rs
@@ -2064,7 +2064,7 @@ pub mod test {
 		fn replace_tranche_less_interest_than_next_works() {
 			let mut tranches = default_tranches();
 
-			// ensure we have an interest rate lower than the the left side tranche with a
+			// ensure we have an interest rate lower than the left side tranche with a
 			// lower index, e.g. lower than 10% at index 1
 			let int_per_sec = Rate::one() / Rate::saturating_from_integer(SECS_PER_YEAR);
 			let min_risk_buffer = Perquintill::from_rational(4u64, 5);