tuxedo-core no longer directly depends on sp-api

Author: JoshOrndorff

Cargo.lock

@@ -19,7 +19,6 @@ aggregator = { path = "aggregator" }
 derive-no-bound = { path = "no_bound" }
 
 # Substrate
-sp-api = { default_features = false, workspace = true }
 sp-core = { default_features = false, workspace = true }
 sp-debug-derive = { features = [ "force-debug" ], default_features = false, workspace = true }
 sp-inherents = { default_features = false, workspace = true }
@@ -47,7 +46,6 @@ std = [
 	"sp-core/std",
 	"sp-std/std",
 	"serde/std",
-	"sp-api/std",
 	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-io/std",

tuxedo-core/Cargo.toml

@@ -21,14 +21,13 @@ use crate::{
 };
 use log::debug;
 use parity_scale_codec::{Decode, Encode};
-use sp_api::{BlockT, HashT, HeaderT, TransactionValidity};
 use sp_core::H256;
 use sp_inherents::{CheckInherentsResult, InherentData};
 use sp_runtime::{
-    traits::{BlakeTwo256, Extrinsic},
+    traits::{BlakeTwo256, Block as BlockT, Extrinsic, Hash as HashT, Header as HeaderT},
     transaction_validity::{
-        InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidityError,
-        ValidTransaction,
+        InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
+        TransactionValidityError, ValidTransaction,
     },
     ApplyExtrinsicResult, StateVersion,
 };

tuxedo-core/src/executive.rs

@@ -6,7 +6,7 @@ use crate::{
     ConstraintChecker, Verifier, EXTRINSIC_KEY, HEIGHT_KEY,
 };
 use parity_scale_codec::Encode;
-use sp_api::HashT;
+use sp_runtime::traits::Hash as HashT;
 use sp_std::vec::Vec;
 
 pub struct TuxedoGenesisConfigBuilder<V, C>(sp_std::marker::PhantomData<(V, C)>);

tuxedo-core/src/genesis/config_builder.rs

@@ -5,13 +5,13 @@ use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use serde::{Deserialize, Serialize};
 use sp_core::H256;
-use sp_runtime::traits::{BlakeTwo256, Extrinsic};
+use sp_runtime::traits::{BlakeTwo256, Extrinsic, Hash as HashT};
 use sp_std::vec::Vec;
 
 // All Tuxedo chains use the same BlakeTwo256 hash.
 pub type Hash = BlakeTwo256;
 /// Opaque block hash type.
-pub type OpaqueHash = <Hash as sp_api::HashT>::Output;
+pub type OpaqueHash = <Hash as HashT>::Output;
 /// All Tuxedo chains use the same u32 BlockNumber.
 pub type BlockNumber = u32;
 /// Because all tuxedo chains use the same Blocknumber and Hash types,