Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit cf2fa65

Browse files
authored
Merge pull request #40 from goerli/a5-misc-tabspaces
convert spaces to tabs
2 parents e92c712 + b4ab154 commit cf2fa65

File tree

8 files changed

+294
-251
lines changed

8 files changed

+294
-251
lines changed

.travis.yml

+35-35
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,48 @@ sudo: required
44
services: docker
55

66
addons:
7-
apt:
8-
packages:
9-
- binutils-dev
10-
- cmake
11-
- file
12-
- g++
13-
- gcc
14-
- libcurl4-openssl-dev
15-
- libdw-dev
16-
- libelf-dev
17-
- libiberty-dev
18-
- libudev-dev
19-
- make
20-
- pkg-config
21-
- software-properties-common
7+
apt:
8+
packages:
9+
- binutils-dev
10+
- cmake
11+
- file
12+
- g++
13+
- gcc
14+
- libcurl4-openssl-dev
15+
- libdw-dev
16+
- libelf-dev
17+
- libiberty-dev
18+
- libudev-dev
19+
- make
20+
- pkg-config
21+
- software-properties-common
2222

2323
matrix:
24-
include:
24+
include:
2525

26-
# GNU/Linux - Sync Goerli Node
27-
- env: TARGET=x86_64-unknown-linux-gnu
28-
name: Sync Goerli Node
29-
rust: stable
30-
script: $TRAVIS_BUILD_DIR/sync.sh
26+
# GNU/Linux - Sync Goerli Node
27+
- env: TARGET=x86_64-unknown-linux-gnu
28+
name: Sync Goerli Node
29+
rust: stable
30+
script: $TRAVIS_BUILD_DIR/sync.sh
3131

32-
# GNU/Linux - Deploy Clique Network
33-
- env: TARGET=x86_64-unknown-linux-gnu
34-
name: Deploy Clique Network
35-
rust: stable
36-
script: $TRAVIS_BUILD_DIR/clique.sh
32+
# GNU/Linux - Deploy Clique Network
33+
- env: TARGET=x86_64-unknown-linux-gnu
34+
name: Deploy Clique Network
35+
rust: stable
36+
script: $TRAVIS_BUILD_DIR/clique.sh
3737

3838
cache:
39-
timeout: 600
40-
cargo: true
41-
directories:
42-
- $HOME/.cargo
43-
- $HOME/.rustup
44-
- $TRAVIS_BUILD_DIR/target
39+
timeout: 600
40+
cargo: true
41+
directories:
42+
- $HOME/.cargo
43+
- $HOME/.rustup
44+
- $TRAVIS_BUILD_DIR/target
4545

4646
before_cache:
47-
- sudo chmod -R a+r $HOME
47+
- sudo chmod -R a+r $HOME
4848

4949
before_script:
50-
- rustup self update
51-
- source ~/.cargo/env || true
50+
- rustup self update
51+
- source ~/.cargo/env || true

ethcore/src/block.rs

+9-10
Original file line numberDiff line numberDiff line change
@@ -444,12 +444,12 @@ impl LockedBlock {
444444
}
445445
s.block.header.set_seal(seal);
446446

447-
engine.seal_header(&mut s.block.header);
448-
/*
449-
if let Some(extra_data) = engine.seal_block_extra_data(&s.block.header) {
450-
s.block.header.set_extra_data(extra_data);
451-
}
452-
*/
447+
engine.seal_header(&mut s.block.header);
448+
/*
449+
if let Some(extra_data) = engine.seal_block_extra_data(&s.block.header) {
450+
s.block.header.set_extra_data(extra_data);
451+
}
452+
*/
453453

454454
s.block.header.compute_hash();
455455
Ok(SealedBlock {
@@ -527,7 +527,7 @@ fn enact(
527527
last_hashes,
528528
engine.executive_author(&header), // Engine such as Clique will calculate author from extra_data. this is only important for executing contracts as the 'executive_author'
529529
//(*header.gas_limit(), *header.gas_limit()),
530-
(3141562.into(), 31415620.into()),
530+
(3141562.into(), 31415620.into()),
531531
header.extra_data().clone(),
532532
is_epoch_begin,
533533
ancestry,
@@ -550,12 +550,11 @@ fn enact(
550550

551551
b.push_transactions(transactions)?;
552552

553-
trace!(target: "blocks", "resetting author to {}, was {}", *header.author(), b.block.header.author());
553+
trace!(target: "blocks", "resetting author to {}, was {}", *header.author(), b.block.header.author());
554554

555555
// reset the author to what it was originally specified as now that transactions are applied
556556
b.block.header.set_author(*header.author());
557557

558-
559558
for u in uncles {
560559
b.push_uncle(u)?;
561560
}
@@ -656,7 +655,7 @@ mod tests {
656655
) -> Result<SealedBlock, Error> {
657656
let header = Unverified::from_rlp(block_bytes.clone())?.header;
658657
Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?
659-
.seal(engine, header.seal().to_vec())?)
658+
.seal(engine, header.seal().to_vec())?)
660659
}
661660

662661
#[test]

0 commit comments

Comments
 (0)