Merge branch 'master' into dp/chore/extract-spec-from-ethcore

* master: Extract engines to own crates (#10966)
openethereum · Aug 22, 2019 · c49895c · c49895c
2 parents 567d96c + 2af3140
commit c49895c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ethcore/builtin/src/lib.rs b/ethcore/builtin/src/lib.rs
@@ -442,7 +442,7 @@ impl Implementation for Bn128Add {
 		if let Some(sum) = AffineG1::from_jacobian(p1 + p2) {
 			// point not at infinity
 			sum.x().to_big_endian(&mut write_buf[0..32]).expect("Cannot fail since 0..32 is 32-byte length");
-			sum.y().to_big_endian(&mut write_buf[32..64]).expect("Cannot fail since 32..64 is 32-byte length");;
+			sum.y().to_big_endian(&mut write_buf[32..64]).expect("Cannot fail since 32..64 is 32-byte length");
 		}
 		output.write(0, &write_buf);
 
@@ -463,7 +463,7 @@ impl Implementation for Bn128Mul {
 		if let Some(sum) = AffineG1::from_jacobian(p * fr) {
 			// point not at infinity
 			sum.x().to_big_endian(&mut write_buf[0..32]).expect("Cannot fail since 0..32 is 32-byte length");
-			sum.y().to_big_endian(&mut write_buf[32..64]).expect("Cannot fail since 32..64 is 32-byte length");;
+			sum.y().to_big_endian(&mut write_buf[32..64]).expect("Cannot fail since 32..64 is 32-byte length");
 		}
 		output.write(0, &write_buf);
 		Ok(())

diff --git a/ethcore/sync/src/chain/mod.rs b/ethcore/sync/src/chain/mod.rs
@@ -1616,7 +1616,7 @@ pub mod tests {
 		// Add some balance to clients and reset nonces
 		for h in &[good_blocks[0], retracted_blocks[0]] {
 			let block = client.block(BlockId::Hash(*h)).unwrap();
-			let sender = sender(&block.transactions()[0]);;
+			let sender = sender(&block.transactions()[0]);
 			client.set_balance(sender, U256::from(10_000_000_000_000_000_000u64));
 			client.set_nonce(sender, U256::from(0));
 		}