Use berlin chainspec for unit test, yolo3 for testnet (#244)

* Fix yolo+berlin specs
* fix yolo3 maximumExtraDataSize
* fmt

crates/ethcore/src/client/evm_test_client.rs

@@ -109,7 +109,6 @@ impl<'a> EvmTestClient<'a> {
                 Some(ethereum::new_byzantium_to_constantinoplefixat5_test())
             }
             ForkSpec::Berlin => Some(ethereum::new_berlin_test()),
-            ForkSpec::Yolo3 => Some(ethereum::new_yolo3_test()),
             ForkSpec::FrontierToHomesteadAt5
             | ForkSpec::HomesteadToDaoAt5
             | ForkSpec::HomesteadToEIP150At5

crates/ethcore/src/ethereum/mod.rs

@@ -163,6 +163,13 @@ pub fn new_sokol<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
         include_bytes!("../../res/chainspec/poasokol.json"),
     )
 }
+/// Create a new YOLO spec
+pub fn new_yolo3<'a, T: Into<SpecParams<'a>>>(params: T) -> Spec {
+    load(
+        params.into(),
+        include_bytes!("../../res/chainspec/yolo3.json"),
+    )
+}
 
 // For tests
 
@@ -275,14 +282,6 @@ pub fn new_eip2930_test() -> Spec {
     )
 }
 
-/// Create a new YOLO spec
-pub fn new_yolo3_test() -> Spec {
-    load(
-        None,
-        include_bytes!("../../res/chainspec/test/yolo3_test.json"),
-    )
-}
-
 /// Create a new Musicoin-MCIP3-era spec.
 pub fn new_mcip3_test() -> Spec {
     load(