Move substrate/serai/* to substrate/*

Cargo.toml

@@ -25,8 +25,8 @@ members = [
 
   "tendermint",
 
-  "substrate/serai/primitives",
-  "substrate/serai/client",
+  "substrate/primitives",
+  "substrate/client",
 
   "substrate/tokens/primitives",
   "substrate/tokens/pallet",

processor/Cargo.toml

@@ -50,7 +50,7 @@ monero-serai = { path = "../coins/monero", features = ["multisig"], optional = t
 log = "0.4"
 tokio = { version = "1", features = ["full"] }
 
-serai-client = { path = "../substrate/serai/client", default-features = false }
+serai-client = { path = "../substrate//client", default-features = false }
 
 messages = { package = "processor-messages", path = "./messages" }
 

processor/messages/Cargo.toml

@@ -24,7 +24,7 @@ serde = { version = "1", features = ["derive"] }
 
 dkg = { path = "../../crypto/dkg", features = ["serde"] }
 
-serai-primitives = { path = "../../substrate/serai/primitives" }
+serai-primitives = { path = "../../substrate/primitives" }
 in-instructions-primitives = { path = "../../substrate/in-instructions/primitives" }
 tokens-primitives = { path = "../../substrate/tokens/primitives" }
 validator-sets-primitives = { path = "../../substrate/validator-sets/primitives" }

substrate/client/Cargo.toml

@@ -3,7 +3,7 @@ name = "serai-client"
 version = "0.1.0"
 description = "Client library for the Serai network"
 license = "AGPL-3.0-only"
-repository = "https://github.com/serai-dex/serai/tree/develop/client"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/client"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 keywords = ["serai"]
 edition = "2021"
@@ -18,15 +18,15 @@ thiserror = { version = "1", optional = true }
 scale = { package = "parity-scale-codec", version = "3" }
 scale-info = { version = "2", optional = true }
 
-serai-runtime = { path = "../../runtime", version = "0.1" }
+serai-runtime = { path = "../runtime", version = "0.1" }
 
 sp-core = { git = "https://github.com/serai-dex/substrate" }
 subxt = { version = "0.27", default-features = false, features = ["jsonrpsee-ws"], optional = true }
 
 bitcoin = { version = "0.29", optional = true }
 
-ciphersuite = { path = "../../../crypto/ciphersuite", version = "0.3", optional = true }
-monero-serai = { path = "../../../coins/monero", version = "0.1.4-alpha", optional = true }
+ciphersuite = { path = "../../crypto/ciphersuite", version = "0.3", optional = true }
+monero-serai = { path = "../../coins/monero", version = "0.1.4-alpha", optional = true }
 
 [features]
 serai = ["thiserror", "scale-info", "subxt"]

substrate/client/src/serai/mod.rs

@@ -156,7 +156,7 @@ impl Serai {
         .await
         .map_err(SeraiError::RpcError)? else {
           // This is an error since there is a block at this index
-          return Err(SeraiError::InvalidNode);
+          Err(SeraiError::InvalidNode)?
         };
 
     Ok(Some(header.hash() == hash))

substrate/in-instructions/pallet/Cargo.toml

@@ -23,7 +23,7 @@ sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features
 frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
 frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 in-instructions-primitives = { path = "../primitives", default-features = false }
 
 tokens-pallet = { path = "../../tokens/pallet", default-features = false }

substrate/in-instructions/primitives/Cargo.toml

@@ -22,7 +22,7 @@ sp-application-crypto = { git = "https://github.com/serai-dex/substrate", defaul
 sp-std = { git = "https://github.com/serai-dex/substrate", default-features = false }
 sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 tokens-primitives = { path = "../../tokens/primitives", default-features = false }
 
 [features]

substrate/primitives/Cargo.toml

@@ -3,7 +3,7 @@ name = "serai-primitives"
 version = "0.1.0"
 description = "Primitives for the Serai blockchain"
 license = "MIT"
-repository = "https://github.com/serai-dex/serai/tree/develop/substrate/serai/primitives"
+repository = "https://github.com/serai-dex/serai/tree/develop/substrate/primitives"
 authors = ["Luke Parker <lukeparker5132@gmail.com>"]
 edition = "2021"
 

substrate/runtime/Cargo.toml

@@ -39,7 +39,7 @@ frame-support = { git = "https://github.com/serai-dex/substrate", default-featur
 frame-executive = { git = "https://github.com/serai-dex/substrate", default-features = false }
 frame-benchmarking = { git = "https://github.com/serai-dex/substrate", default-features = false, optional = true }
 
-serai-primitives = { path = "../serai/primitives", default-features = false }
+serai-primitives = { path = "..//primitives", default-features = false }
 
 pallet-timestamp = { git = "https://github.com/serai-dex/substrate", default-features = false }
 

substrate/tokens/pallet/Cargo.toml

@@ -20,7 +20,7 @@ frame-support = { git = "https://github.com/serai-dex/substrate", default-featur
 
 pallet-assets = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 tokens-primitives = { path = "../primitives", default-features = false }
 
 [features]

substrate/tokens/primitives/Cargo.toml

@@ -18,7 +18,7 @@ scale-info = { version = "2", default-features = false, features = ["derive"] }
 
 serde = { version = "1", features = ["derive"], optional = true }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 
 [dev-dependencies]
 sp-runtime = { git = "https://github.com/serai-dex/substrate", default-features = false }

substrate/validator-sets/pallet/Cargo.toml

@@ -20,7 +20,7 @@ sp-core = { git = "https://github.com/serai-dex/substrate", default-features = f
 frame-system = { git = "https://github.com/serai-dex/substrate", default-features = false }
 frame-support = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 validator-sets-primitives = { path = "../primitives", default-features = false }
 
 [features]

substrate/validator-sets/primitives/Cargo.toml

@@ -21,7 +21,7 @@ serde = { version = "1", features = ["derive"], optional = true }
 
 sp-core = { git = "https://github.com/serai-dex/substrate", default-features = false }
 
-serai-primitives = { path = "../../serai/primitives", default-features = false }
+serai-primitives = { path = "../..//primitives", default-features = false }
 
 [features]
 std = ["zeroize", "scale/std", "scale-info/std", "serde", "sp-core/std", "serai-primitives/std"]