From c8e147cf93721c0e9d0077685412e02ad891e040 Mon Sep 17 00:00:00 2001
From: Nick Robinson <npr251@gmail.com>
Date: Tue, 9 Jan 2024 17:47:41 +0000
Subject: [PATCH] Repo package ObjectStore -> RustyObjectStore

To avoid name clash with already registered Julia packages.
---
 Project.toml                                | 2 +-
 README.md                                   | 2 +-
 src/{ObjectStore.jl => RustyObjectStore.jl} | 2 +-
 test/azure_blobs_exception_tests.jl         | 7 +++----
 test/azure_blobs_tests.jl                   | 4 ++--
 test/common_testsetup.jl                    | 2 +-
 test/release_test.jl                        | 2 +-
 test/runtests.jl                            | 4 ++--
 8 files changed, 12 insertions(+), 13 deletions(-)
 rename src/{ObjectStore.jl => RustyObjectStore.jl} (99%)

diff --git a/Project.toml b/Project.toml
index a0671e1..d6b11b6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,4 +1,4 @@
-name = "ObjectStore"
+name = "RustyObjectStore"
 uuid = "1b5eed3d-1f46-4baa-87f3-a4a892b23610"
 version = "0.1.0"
 
diff --git a/README.md b/README.md
index 0c80674..28fb536 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# ObjectStore.jl2
\ No newline at end of file
+# RustyObjectStore.jl
diff --git a/src/ObjectStore.jl b/src/RustyObjectStore.jl
similarity index 99%
rename from src/ObjectStore.jl
rename to src/RustyObjectStore.jl
index 88e1ba5..5d34968 100644
--- a/src/ObjectStore.jl
+++ b/src/RustyObjectStore.jl
@@ -1,4 +1,4 @@
-module ObjectStore
+module RustyObjectStore
 
 export init_object_store, blob_get!, blob_put, AzureCredentials, ObjectStoreConfig
 
diff --git a/test/azure_blobs_exception_tests.jl b/test/azure_blobs_exception_tests.jl
index 5681b8e..4583854 100644
--- a/test/azure_blobs_exception_tests.jl
+++ b/test/azure_blobs_exception_tests.jl
@@ -1,8 +1,7 @@
 @testitem "Basic BlobStorage exceptions" setup=[InitializeObjectStore] begin
     using CloudBase.CloudTest: Azurite
     import CloudBase
-    using ObjectStore: blob_get!, blob_put, AzureCredentials
-    import ObjectStore
+    using RustyObjectStore: RustyObjectStore, blob_get!, blob_put, AzureCredentials
 
     # For interactive testing, use Azurite.run() instead of Azurite.with()
     # conf, p = Azurite.run(; debug=true, public=false); atexit(() -> kill(p))
@@ -147,7 +146,7 @@
 
     @testset "multiple start" begin
         config = ObjectStoreConfig(5, 5)
-        res = @ccall ObjectStore.rust_lib.start(config::ObjectStoreConfig)::Cint
+        res = @ccall RustyObjectStore.rust_lib.start(config::ObjectStoreConfig)::Cint
         @test res == 1 # Rust CResult::Error
     end
 end # @testitem
@@ -164,7 +163,7 @@ end # @testitem
 @testitem "BlobStorage retries" setup=[InitializeObjectStore] begin
     using CloudBase.CloudTest: Azurite
     import CloudBase
-    using ObjectStore: blob_get!, blob_put, AzureCredentials
+    using RustyObjectStore: blob_get!, blob_put, AzureCredentials
     import HTTP
     import Sockets
 
diff --git a/test/azure_blobs_tests.jl b/test/azure_blobs_tests.jl
index 396e4e2..0a3fbd7 100644
--- a/test/azure_blobs_tests.jl
+++ b/test/azure_blobs_tests.jl
@@ -1,6 +1,6 @@
 @testitem "Basic BlobStorage usage" setup=[InitializeObjectStore] begin
 using CloudBase.CloudTest: Azurite
-using ObjectStore: blob_get!, blob_put, AzureCredentials
+using RustyObjectStore: blob_get!, blob_put, AzureCredentials
 
 # For interactive testing, use Azurite.run() instead of Azurite.with()
 # conf, p = Azurite.run(; debug=true, public=false); atexit(() -> kill(p))
@@ -105,7 +105,7 @@ end # @testitem
 # TODO: implement a way for GET to be called without credentials
 @test_skip begin
 using CloudBase.CloudTest: Azurite
-using ObjectStore: blob_get!, blob_put, AzureCredentials
+using RustyObjectStore: blob_get!, blob_put, AzureCredentials
 
 # For interactive testing, use Azurite.run() instead of Azurite.with()
 # conf, p = Azurite.run(; debug=true, public=true); atexit(() -> kill(p))
diff --git a/test/common_testsetup.jl b/test/common_testsetup.jl
index 650fdec..5ae54b4 100644
--- a/test/common_testsetup.jl
+++ b/test/common_testsetup.jl
@@ -1,5 +1,5 @@
 @testsetup module InitializeObjectStore
-    using ObjectStore
+    using RustyObjectStore
     # Since we currently only support centralized configs, we need to have one that is compatible
     # with all the tests (some of the tests would take too long if we use default values).
     max_retries = 2
diff --git a/test/release_test.jl b/test/release_test.jl
index 231c13e..7c944f0 100644
--- a/test/release_test.jl
+++ b/test/release_test.jl
@@ -3,5 +3,5 @@
 # for development reasons, but it should never be set in CI.
 @testitem "Using object_store_ffi_jll" begin
     using object_store_ffi_jll
-    @test ObjectStore.rust_lib == object_store_ffi_jll.libobject_store_ffi
+    @test RustyObjectStore.rust_lib == object_store_ffi_jll.libobject_store_ffi
 end
diff --git a/test/runtests.jl b/test/runtests.jl
index 9cd700e..61f4ccf 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,6 +1,6 @@
 using ReTestItems
-using ObjectStore
+using RustyObjectStore
 
 withenv("RUST_BACKTRACE"=>1) do
-    runtests(ObjectStore, testitem_timeout=180, nworkers=1)
+    runtests(RustyObjectStore; testitem_timeout=180, nworkers=1)
 end