From b83a0434a4d0a05aee027958be98e5ac290b88b8 Mon Sep 17 00:00:00 2001
From: Trent Nelson <trent@solana.com>
Date: Tue, 3 Mar 2020 22:19:09 -0700
Subject: [PATCH] Prepare for multiple nonce account state versions (#8612)

automerge
---
 sdk/src/nonce/{state.rs => state/current.rs} | 18 +----------------
 sdk/src/nonce/state/mod.rs                   | 21 ++++++++++++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)
 rename sdk/src/nonce/{state.rs => state/current.rs} (73%)
 create mode 100644 sdk/src/nonce/state/mod.rs

diff --git a/sdk/src/nonce/state.rs b/sdk/src/nonce/state/current.rs
similarity index 73%
rename from sdk/src/nonce/state.rs
rename to sdk/src/nonce/state/current.rs
index a07af73ab8..4c3894096f 100644
--- a/sdk/src/nonce/state.rs
+++ b/sdk/src/nonce/state/current.rs
@@ -1,3 +1,4 @@
+use super::Versions;
 use crate::{hash::Hash, pubkey::Pubkey};
 use serde_derive::{Deserialize, Serialize};
 
@@ -33,23 +34,6 @@ impl State {
     }
 }
 
-#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
-pub enum Versions {
-    Current(Box<State>),
-}
-
-impl Versions {
-    pub fn new_current(state: State) -> Self {
-        Self::Current(Box::new(state))
-    }
-
-    pub fn convert_to_current(self) -> State {
-        match self {
-            Self::Current(state) => *state,
-        }
-    }
-}
-
 #[cfg(test)]
 mod test {
     use super::*;
diff --git a/sdk/src/nonce/state/mod.rs b/sdk/src/nonce/state/mod.rs
new file mode 100644
index 0000000000..52930c8054
--- /dev/null
+++ b/sdk/src/nonce/state/mod.rs
@@ -0,0 +1,21 @@
+mod current;
+pub use current::{Meta, State};
+
+use serde_derive::{Deserialize, Serialize};
+
+#[derive(Debug, Serialize, Deserialize, PartialEq, Clone)]
+pub enum Versions {
+    Current(Box<State>),
+}
+
+impl Versions {
+    pub fn new_current(state: State) -> Self {
+        Self::Current(Box::new(state))
+    }
+
+    pub fn convert_to_current(self) -> State {
+        match self {
+            Self::Current(state) => *state,
+        }
+    }
+}