From fc1e3396ef53bfb95c50b6ef8e1e51d773e39090 Mon Sep 17 00:00:00 2001
From: Wilfried Kopp <wilfried@parity.io>
Date: Thu, 24 Jun 2021 14:52:01 +0200
Subject: [PATCH] chore: fix srtool and a few paths

---
 .github/workflows/srtool.yml                    | 1 -
 runtime/statemine/src/weights/pallet_session.rs | 2 +-
 runtime/statemine/src/weights/pallet_uniques.rs | 2 +-
 runtime/statemint/src/weights/pallet_session.rs | 2 +-
 runtime/westmint/src/weights/pallet_session.rs  | 2 +-
 scripts/benchmarks.sh                           | 4 ++--
 scripts/generate_genesis_value.sh               | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/srtool.yml b/.github/workflows/srtool.yml
index 4087be5ee90..21e2ffec79d 100644
--- a/.github/workflows/srtool.yml
+++ b/.github/workflows/srtool.yml
@@ -29,7 +29,6 @@ jobs:
         uses: chevdor/srtool-actions@v0.1.0
         with:
           chain: ${{ matrix.chain }}
-          runtime_dir: polkadot-parachains/${{ matrix.chain }}-runtime
       - name: Summary
         run: |
           echo '${{ steps.srtool_build.outputs.json }}' | jq > ${{ matrix.chain }}-srtool-digest.json
diff --git a/runtime/statemine/src/weights/pallet_session.rs b/runtime/statemine/src/weights/pallet_session.rs
index 9cb59607b38..bbcfaf34ba1 100644
--- a/runtime/statemine/src/weights/pallet_session.rs
+++ b/runtime/statemine/src/weights/pallet_session.rs
@@ -16,7 +16,7 @@
 // --steps=50
 // --repeat=20
 // --raw
-// --output=./polkadot-parachains/statemine-runtime/src/weights
+// --output=./runtime/statemine/src/weights
 
 
 #![allow(unused_parens)]
diff --git a/runtime/statemine/src/weights/pallet_uniques.rs b/runtime/statemine/src/weights/pallet_uniques.rs
index 4cab4dffbf7..6040d8b0427 100644
--- a/runtime/statemine/src/weights/pallet_uniques.rs
+++ b/runtime/statemine/src/weights/pallet_uniques.rs
@@ -32,7 +32,7 @@
 // --wasm-execution=compiled
 // --heap-pages=4096
 // --header=./file_header.txt
-// --output=./polkadot-parachains/statemine-runtime/src/weights/
+// --output=./runtime/statemine/src/weights/
 
 
 #![allow(unused_parens)]
diff --git a/runtime/statemint/src/weights/pallet_session.rs b/runtime/statemint/src/weights/pallet_session.rs
index 389e7c2b9ea..20278107d0c 100644
--- a/runtime/statemint/src/weights/pallet_session.rs
+++ b/runtime/statemint/src/weights/pallet_session.rs
@@ -16,7 +16,7 @@
 // --steps=50
 // --repeat=20
 // --raw
-// --output=./polkadot-parachains/statemint-runtime/src/weights
+// --output=./runtime/statemint/src/weights
 
 
 #![allow(unused_parens)]
diff --git a/runtime/westmint/src/weights/pallet_session.rs b/runtime/westmint/src/weights/pallet_session.rs
index 389e7c2b9ea..20278107d0c 100644
--- a/runtime/westmint/src/weights/pallet_session.rs
+++ b/runtime/westmint/src/weights/pallet_session.rs
@@ -16,7 +16,7 @@
 // --steps=50
 // --repeat=20
 // --raw
-// --output=./polkadot-parachains/statemint-runtime/src/weights
+// --output=./runtime/statemint/src/weights
 
 
 #![allow(unused_parens)]
diff --git a/scripts/benchmarks.sh b/scripts/benchmarks.sh
index eee548dd613..29aa2973b57 100755
--- a/scripts/benchmarks.sh
+++ b/scripts/benchmarks.sh
@@ -2,8 +2,8 @@
 
 steps=50
 repeat=20
-statemineOutput=./polkadot-parachains/statemine-runtime/src/weights
-statemintOutput=./polkadot-parachains/statemint-runtime/src/weights
+statemineOutput=./runtime/statemine/src/weights
+statemintOutput=./runtime/statemint/src/weights
 statemineChain=statemine-dev
 statemintChain=statemint-dev
 pallets=(
diff --git a/scripts/generate_genesis_value.sh b/scripts/generate_genesis_value.sh
index 26b87ef81b6..74aaedf5619 100755
--- a/scripts/generate_genesis_value.sh
+++ b/scripts/generate_genesis_value.sh
@@ -14,4 +14,4 @@ pushd generate_genesis_values
 yarn
 popd
 
-node generate_genesis_values ../polkadot-parachains/res/$chain_id.json ../polkadot-parachains/res/${chain_id}_genesis_values.json
+node generate_genesis_values ../runtime/res/$chain_id.json ../runtime/res/${chain_id}_genesis_values.json