From f040987c9f115bc9dd7d5bcf019a98031a1365ec Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Fri, 22 Nov 2019 16:10:53 -0700
Subject: [PATCH] Move date oracle to config program (#7105)

automerge
---
 Cargo.lock                                        | 1 +
 programs/config/Cargo.toml                        | 1 +
 programs/{vest => config}/src/date_instruction.rs | 2 +-
 programs/config/src/lib.rs                        | 1 +
 programs/vest/src/lib.rs                          | 1 -
 programs/vest/src/vest_processor.rs               | 4 ++--
 6 files changed, 6 insertions(+), 4 deletions(-)
 rename programs/{vest => config}/src/date_instruction.rs (96%)

diff --git a/Cargo.lock b/Cargo.lock
index 0658de7fa2..7cf4d87df2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3269,6 +3269,7 @@ name = "solana-config-program"
 version = "0.21.0"
 dependencies = [
  "bincode 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "chrono 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/programs/config/Cargo.toml b/programs/config/Cargo.toml
index abcbe215ba..6679802187 100644
--- a/programs/config/Cargo.toml
+++ b/programs/config/Cargo.toml
@@ -10,6 +10,7 @@ edition = "2018"
 
 [dependencies]
 bincode = "1.2.0"
+chrono = { version = "0.4.9", features = ["serde"] }
 log = "0.4.8"
 serde = "1.0.102"
 serde_derive = "1.0.102"
diff --git a/programs/vest/src/date_instruction.rs b/programs/config/src/date_instruction.rs
similarity index 96%
rename from programs/vest/src/date_instruction.rs
rename to programs/config/src/date_instruction.rs
index 379fa922d0..c4f732644a 100644
--- a/programs/vest/src/date_instruction.rs
+++ b/programs/config/src/date_instruction.rs
@@ -1,3 +1,4 @@
+use crate::{config_instruction, ConfigState};
 ///
 /// A library for creating a trusted date oracle.
 ///
@@ -7,7 +8,6 @@ use chrono::{
     serde::ts_seconds,
 };
 use serde_derive::{Deserialize, Serialize};
-use solana_config_program::{config_instruction, ConfigState};
 use solana_sdk::{instruction::Instruction, pubkey::Pubkey};
 
 #[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
diff --git a/programs/config/src/lib.rs b/programs/config/src/lib.rs
index 7bd3f4f6d2..0d26c3548a 100644
--- a/programs/config/src/lib.rs
+++ b/programs/config/src/lib.rs
@@ -1,5 +1,6 @@
 pub mod config_instruction;
 pub mod config_processor;
+pub mod date_instruction;
 
 use crate::config_processor::process_instruction;
 use bincode::{deserialize, serialize, serialized_size};
diff --git a/programs/vest/src/lib.rs b/programs/vest/src/lib.rs
index eff43a56f4..8005e7081a 100644
--- a/programs/vest/src/lib.rs
+++ b/programs/vest/src/lib.rs
@@ -1,4 +1,3 @@
-pub mod date_instruction;
 pub mod vest_instruction;
 pub mod vest_processor;
 pub mod vest_schedule;
diff --git a/programs/vest/src/vest_processor.rs b/programs/vest/src/vest_processor.rs
index 8983c9aa6f..3830db88ca 100644
--- a/programs/vest/src/vest_processor.rs
+++ b/programs/vest/src/vest_processor.rs
@@ -1,10 +1,10 @@
 //! vest program
-use crate::date_instruction::DateConfig;
 use crate::{
     vest_instruction::{VestError, VestInstruction},
     vest_state::VestState,
 };
 use chrono::prelude::*;
+use solana_config_program::date_instruction::DateConfig;
 use solana_config_program::get_config_data;
 use solana_sdk::{
     account::{Account, KeyedAccount},
@@ -143,9 +143,9 @@ pub fn process_instruction(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::date_instruction;
     use crate::id;
     use crate::vest_instruction;
+    use solana_config_program::date_instruction;
     use solana_runtime::bank::Bank;
     use solana_runtime::bank_client::BankClient;
     use solana_sdk::client::SyncClient;