Scale trait and move to u32 blocknumbers (#3357)

* Scale trait and move to u32 blocknumbers.

* Fixes

* Cleanups

* Update node/runtime/src/lib.rs

Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com>

* Fix up some of the factory stuff.

* Update core/sr-primitives/src/traits.rs

Co-Authored-By: Shawn Tabrizi <shawntabrizi@gmail.com>

* Move Nonce/Index to u32 (#3361)

* Force a non-borked version of upstream crate

* Line lengths and runtime version bump

substrate/srml/authorship/src/lib.rs

@@ -478,6 +478,10 @@ mod tests {
 		type MaximumBlockLength = MaximumBlockLength;
 	}
 
+	parameter_types! {
+		pub const UncleGenerations: u64 = 5;
+	}
+
 	impl Trait for Test {
 		type FindAuthor = AuthorGiven;
 		type UncleGenerations = UncleGenerations;
@@ -506,10 +510,6 @@ mod tests {
 		}
 	}
 
-	parameter_types! {
-		pub const UncleGenerations: u64 = 5;
-	}
-
 	pub struct VerifyBlock;
 
 	impl VerifySeal<Header, u64> for VerifyBlock {
@@ -550,7 +550,6 @@ mod tests {
 		header
 	}
 
-
 	fn create_header(number: u64, parent_hash: H256, state_root: H256) -> Header {
 		Header::new(
 			number,