Consolidate Nonce state under one struct (#8624)

automerge
2020-03-04 09:51:48 -07:00
parent 8f60f1093a
commit 1cc7131bb7
12 changed files with 180 additions and 163 deletions
--- a/runtime/src/accounts.rs
+++ b/runtime/src/accounts.rs
@@ -921,10 +921,10 @@ mod tests {
            nonce.pubkey(),
            Account::new_data(
                min_balance * 2,
-                &nonce::State::Initialized(
-                    nonce::state::Meta::new(&Pubkey::default()),
-                    Hash::default(),
-                ),
+                &nonce::State::Initialized(nonce::state::Data {
+                    authority: Pubkey::default(),
+                    blockhash: Hash::default(),
+                }),
                &system_program::id(),
            )
            .unwrap(),