From fd562ff4c464f6917a86b560e0a650328df57734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bla=C5=BE=20Hrastnik?= <blaz@mxxn.io>
Date: Thu, 14 Mar 2024 23:10:50 +0900
Subject: [PATCH] Fix anchor ocr2 case naming issue

---
 contracts/Anchor.toml                             | 4 ++--
 contracts/Cargo.lock                              | 2 +-
 contracts/programs/{ocr2 => ocr_2}/Cargo.toml     | 4 ++--
 contracts/programs/{ocr2 => ocr_2}/Xargo.toml     | 0
 contracts/programs/{ocr2 => ocr_2}/src/context.rs | 0
 contracts/programs/{ocr2 => ocr_2}/src/event.rs   | 0
 contracts/programs/{ocr2 => ocr_2}/src/lib.rs     | 2 +-
 contracts/programs/{ocr2 => ocr_2}/src/state.rs   | 0
 contracts/tests/ocr2.spec.ts                      | 4 ++--
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename contracts/programs/{ocr2 => ocr_2}/Cargo.toml (95%)
 rename contracts/programs/{ocr2 => ocr_2}/Xargo.toml (100%)
 rename contracts/programs/{ocr2 => ocr_2}/src/context.rs (100%)
 rename contracts/programs/{ocr2 => ocr_2}/src/event.rs (100%)
 rename contracts/programs/{ocr2 => ocr_2}/src/lib.rs (99%)
 rename contracts/programs/{ocr2 => ocr_2}/src/state.rs (100%)

diff --git a/contracts/Anchor.toml b/contracts/Anchor.toml
index aa229ed2b..6371e3d9c 100644
--- a/contracts/Anchor.toml
+++ b/contracts/Anchor.toml
@@ -1,4 +1,4 @@
-anchor_version = "0.25.0"
+anchor_version = "0.29.0"
 
 [registry]
 url = "https://anchor.projectserum.com"
@@ -21,6 +21,6 @@ test = "yarn run test"
 # TODO: add pubkeys
 
 [programs.localnet]
-ocr2 = "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ"
+ocr_2 = "cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ" # need to rename the idl to satisfy anchor.js...
 store = "HEvSKofvBgfaexv23kMabbYqxasxU3mQ4ibBMEmJWHny"
 access_controller = "9xi644bRR8birboDGdTiwBq3C7VEeR7VuamRYYXCubUW"
diff --git a/contracts/Cargo.lock b/contracts/Cargo.lock
index ed71d236b..ba4b5e1d7 100644
--- a/contracts/Cargo.lock
+++ b/contracts/Cargo.lock
@@ -1344,7 +1344,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "ocr2"
+name = "ocr_2"
 version = "1.0.1"
 dependencies = [
  "access-controller",
diff --git a/contracts/programs/ocr2/Cargo.toml b/contracts/programs/ocr_2/Cargo.toml
similarity index 95%
rename from contracts/programs/ocr2/Cargo.toml
rename to contracts/programs/ocr_2/Cargo.toml
index b949cb92c..ddf7089df 100644
--- a/contracts/programs/ocr2/Cargo.toml
+++ b/contracts/programs/ocr_2/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
-name = "ocr2"
+name = "ocr_2"
 version = "1.0.1"
 description = "Created with Anchor"
 edition = "2021"
 
 [lib]
 crate-type = ["cdylib", "lib"]
-name = "ocr2"
+name = "ocr_2"
 
 [features]
 no-entrypoint = []
diff --git a/contracts/programs/ocr2/Xargo.toml b/contracts/programs/ocr_2/Xargo.toml
similarity index 100%
rename from contracts/programs/ocr2/Xargo.toml
rename to contracts/programs/ocr_2/Xargo.toml
diff --git a/contracts/programs/ocr2/src/context.rs b/contracts/programs/ocr_2/src/context.rs
similarity index 100%
rename from contracts/programs/ocr2/src/context.rs
rename to contracts/programs/ocr_2/src/context.rs
diff --git a/contracts/programs/ocr2/src/event.rs b/contracts/programs/ocr_2/src/event.rs
similarity index 100%
rename from contracts/programs/ocr2/src/event.rs
rename to contracts/programs/ocr_2/src/event.rs
diff --git a/contracts/programs/ocr2/src/lib.rs b/contracts/programs/ocr_2/src/lib.rs
similarity index 99%
rename from contracts/programs/ocr2/src/lib.rs
rename to contracts/programs/ocr_2/src/lib.rs
index be3b2207f..330173a87 100644
--- a/contracts/programs/ocr2/src/lib.rs
+++ b/contracts/programs/ocr_2/src/lib.rs
@@ -27,7 +27,7 @@ pub struct NewOracle {
 }
 
 #[program]
-pub mod ocr2 {
+pub mod ocr_2 {
     use super::*;
     pub fn initialize(ctx: Context<Initialize>, min_answer: i128, max_answer: i128) -> Result<()> {
         let mut state = ctx.accounts.state.load_init()?;
diff --git a/contracts/programs/ocr2/src/state.rs b/contracts/programs/ocr_2/src/state.rs
similarity index 100%
rename from contracts/programs/ocr2/src/state.rs
rename to contracts/programs/ocr_2/src/state.rs
diff --git a/contracts/tests/ocr2.spec.ts b/contracts/tests/ocr2.spec.ts
index faa11a57f..7452a4f71 100644
--- a/contracts/tests/ocr2.spec.ts
+++ b/contracts/tests/ocr2.spec.ts
@@ -54,9 +54,9 @@ class Round extends Assignable {}
 const header = 8 + 192; // account discriminator + header
 const transmissionSize = 48;
 
-describe("ocr2", async () => {
+describe("ocr2", () => {
   // Configure the client to use the local cluster.
-  const provider = anchor.AnchorProvider.env();
+  const provider = anchor.AnchorProvider.local();
   anchor.setProvider(provider);
 
   // Generate a new wallet keypair and airdrop SOL