Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove dead code.
  • Loading branch information
gavofyork committed Apr 7, 2018
commit e243e8bfe77d1b81dc3a04b573cd6884c7d3fdd3
Binary file not shown.
Binary file not shown.
4 changes: 4 additions & 0 deletions polkadot/consensus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -570,9 +570,13 @@ impl<C: PolkadotApi, R: TableRouter> bft::Proposer for Proposer<C, R> {
}

let polkadot_block = block_builder.bake();
info!("Proposing block [number: {}; extrinsics: [{}], parent_hash: {}]", polkadot_block.header.number, polkadot_block.extrinsics.len(), polkadot_block.header.parent_hash);

let substrate_block = Slicable::decode(&mut polkadot_block.encode().as_slice())
.expect("polkadot blocks defined to serialize to substrate blocks correctly; qed");

assert!(evaluate_proposal(&substrate_block, &*self.client, current_timestamp(), &self.parent_hash, &self.parent_id).is_ok());

Ok(substrate_block)
}

Expand Down
Binary file modified polkadot/runtime/wasm/genesis.wasm
Binary file not shown.
Binary file not shown.
Binary file not shown.
7 changes: 0 additions & 7 deletions substrate/client/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,6 @@ impl<B, E> Client<B, E> where
})
}

/// Submit a transaction to this for potential inclusion in a block.
pub fn submit_transaction(&self, _tx: block::Transaction) -> error::Result<()> {
// TODO: introduce a tx queue and place the transaction in there. tx queue or some of its
// logic will need to be generic.
unimplemented!();
}

/// Get a reference to the state at a given block.
pub fn state_at(&self, block: &BlockId) -> error::Result<B::State> {
self.backend.state_at(*block)
Expand Down