Skip to content

Commit 1702ac6

Browse files
committed
tuxedo-core no longer directly depends on sp-api
1 parent 83cfe98 commit 1702ac6

File tree

5 files changed

+6
-10
lines changed

5 files changed

+6
-10
lines changed

Cargo.lock

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tuxedo-core/Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ aggregator = { path = "aggregator" }
1919
derive-no-bound = { path = "no_bound" }
2020

2121
# Substrate
22-
sp-api = { default_features = false, workspace = true }
2322
sp-core = { default_features = false, workspace = true }
2423
sp-debug-derive = { features = [ "force-debug" ], default_features = false, workspace = true }
2524
sp-inherents = { default_features = false, workspace = true }
@@ -47,7 +46,6 @@ std = [
4746
"sp-core/std",
4847
"sp-std/std",
4948
"serde/std",
50-
"sp-api/std",
5149
"sp-genesis-builder/std",
5250
"sp-inherents/std",
5351
"sp-io/std",

tuxedo-core/src/executive.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,13 @@ use crate::{
2121
};
2222
use log::debug;
2323
use parity_scale_codec::{Decode, Encode};
24-
use sp_api::{BlockT, HashT, HeaderT, TransactionValidity};
2524
use sp_core::H256;
2625
use sp_inherents::{CheckInherentsResult, InherentData};
2726
use sp_runtime::{
28-
traits::{BlakeTwo256, Extrinsic},
27+
traits::{BlakeTwo256, Block as BlockT, Extrinsic, Hash as HashT, Header as HeaderT},
2928
transaction_validity::{
30-
InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidityError,
31-
ValidTransaction,
29+
InvalidTransaction, TransactionLongevity, TransactionSource, TransactionValidity,
30+
TransactionValidityError, ValidTransaction,
3231
},
3332
ApplyExtrinsicResult, StateVersion,
3433
};

tuxedo-core/src/genesis/config_builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::{
66
ConstraintChecker, Verifier, EXTRINSIC_KEY, HEIGHT_KEY,
77
};
88
use parity_scale_codec::Encode;
9-
use sp_api::HashT;
9+
use sp_runtime::traits::Hash as HashT;
1010
use sp_std::vec::Vec;
1111

1212
pub struct TuxedoGenesisConfigBuilder<V, C>(sp_std::marker::PhantomData<(V, C)>);

tuxedo-core/src/types.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use parity_scale_codec::{Decode, Encode};
55
use scale_info::TypeInfo;
66
use serde::{Deserialize, Serialize};
77
use sp_core::H256;
8-
use sp_runtime::traits::{BlakeTwo256, Extrinsic};
8+
use sp_runtime::traits::{BlakeTwo256, Extrinsic, Hash as HashT};
99
use sp_std::vec::Vec;
1010

1111
// All Tuxedo chains use the same BlakeTwo256 hash.
1212
pub type Hash = BlakeTwo256;
1313
/// Opaque block hash type.
14-
pub type OpaqueHash = <Hash as sp_api::HashT>::Output;
14+
pub type OpaqueHash = <Hash as HashT>::Output;
1515
/// All Tuxedo chains use the same u32 BlockNumber.
1616
pub type BlockNumber = u32;
1717
/// Because all tuxedo chains use the same Blocknumber and Hash types,

0 commit comments

Comments
 (0)