Migrate RPC to new schema

2 files changed, 14 insertions, 6 deletions

diff --git a/src/garage/admin_rpc.rs b/src/garage/admin_rpc.rs
index 6ebd04a9..8bf1dec2 100644
--- a/src/garage/admin_rpc.rs
+++ b/src/garage/admin_rpc.rs
@@ -89,7 +89,7 @@ impl AdminRpcHandler {
 						}
 						bucket
 							.state
-							.update(BucketState::Present(crdt::LWWMap::new()));
+							.update(BucketState::Present(BucketParams::new()));
 						bucket
 					}
 					None => Bucket::new(query.name.clone()),
@@ -157,6 +157,7 @@ impl AdminRpcHandler {
 			}
 			BucketOperation::Website(query) => {
 				/*let bucket = self.get_existing_bucket(&query.bucket).await?;
+        
 				if query.allow && query.deny {
 					return Err(Error::Message(format!("Website can not be both allowed and denied on a bucket")));
 				}
@@ -278,7 +279,8 @@ impl AdminRpcHandler {
 		allow_read: bool,
 		allow_write: bool,
 	) -> Result<(), Error> {
-		if let BucketState::Present(ak) = bucket.state.get_mut() {
+		if let BucketState::Present(params) = bucket.state.get_mut() {
+			let ak = &mut params.authorized_keys;
 			let old_ak = ak.take_and_clear();
 			ak.merge(&old_ak.update_mutator(
 				key_id.to_string(),
diff --git a/src/model/bucket_table.rs b/src/model/bucket_table.rs
index 08d0d168..609490cb 100644
--- a/src/model/bucket_table.rs
+++ b/src/model/bucket_table.rs
@@ -55,14 +55,20 @@ impl CRDT for BucketParams {
 	}
 }
 
+impl BucketParams {
+	pub fn new() -> Self {
+		BucketParams {
+			authorized_keys: crdt::LWWMap::new(),
+			website: crdt::LWW::new(false)
+		}
+	}
+}
+
 impl Bucket {
 	pub fn new(name: String) -> Self {
 		Bucket {
 			name,
-			state: crdt::LWW::new(BucketState::Present(BucketParams {
-				authorized_keys: crdt::LWWMap::new(),
-				website: crdt::LWW::new(false)
-			})),
+			state: crdt::LWW::new(BucketState::Present(BucketParams::new())),
 		}
 	}
 	pub fn is_deleted(&self) -> bool {