Skip to content

Commit faf1b42

Browse files
authored
Merge pull request #414 from subspace/remove-uncles-inherent-provider
Uncles inherent provider is an artifact of the inherited codebase, we never had them in the protocol
2 parents 5aeb214 + f8ecfe7 commit faf1b42

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

Cargo.lock

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/subspace-service/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ sc-consensus = { version = "0.10.0-dev", git = "https://github.com/paritytech/su
2828
sc-consensus-subspace = { version = "0.1.0", path = "../sc-consensus-subspace" }
2929
sc-consensus-subspace-rpc = { version = "0.1.0", path = "../sc-consensus-subspace-rpc" }
3030
sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c4f3d028621edb293d2c423516221aa396f76a2d" }
31-
sc-consensus-uncles = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c4f3d028621edb293d2c423516221aa396f76a2d" }
3231
sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c4f3d028621edb293d2c423516221aa396f76a2d", features = ["wasmtime"] }
3332
sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c4f3d028621edb293d2c423516221aa396f76a2d" }
3433
sc-rpc = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "c4f3d028621edb293d2c423516221aa396f76a2d" }

crates/subspace-service/src/lib.rs

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -228,12 +228,7 @@ where
228228
subspace_link.root_blocks_for_block(parent_block_number + 1),
229229
);
230230

231-
let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider(
232-
&*client,
233-
parent_hash,
234-
)?;
235-
236-
Ok((timestamp, subspace_inherents, uncles))
231+
Ok((timestamp, subspace_inherents))
237232
}
238233
}
239234
},
@@ -404,12 +399,7 @@ where
404399
subspace_link.root_blocks_for_block(parent_block_number + 1),
405400
);
406401

407-
let uncles = sc_consensus_uncles::create_uncles_inherent_data_provider(
408-
&*client,
409-
parent_hash,
410-
)?;
411-
412-
Ok((timestamp, subspace_inherents, uncles))
402+
Ok((timestamp, subspace_inherents))
413403
}
414404
}
415405
},

0 commit comments

Comments
 (0)