fix(proxy): session not loaded on restart (#907)

A regression was introduced in our upstream dependency `kv` which breaks
the loading of our session from disk. Until we land a patch, this is the
stopgap solution.

Stop-gap for #900

proxy/api/Cargo.toml

@@ -15,7 +15,6 @@ default-run = "api"
 anyhow = "1.0"
 directories = "2.0"
 futures = { version = "0.3", features = [ "compat" ] }
-kv = { version = "0.22", features = [ "json-value" ] }
 log = "0.4"
 percent-encoding = "2.1"
 pico-args = "0.3"
@@ -28,6 +27,11 @@ thiserror = "1.0"
 tokio = { version = "0.2", features = [ "dns", "macros", "time" ] }
 warp = { version = "0.2", default-features = false }
 
+[dependencies.kv]
+git = "https://github.com/zshipko/rust-kv.git"
+rev = "a98e1ace84b22ceaac276abf796633bd8e735500"
+features = [ "json-value" ]
+
 [dependencies.coco]
 path = "../coco"
 

proxy/api/src/session.rs

@@ -91,7 +91,7 @@ fn get(store: &kv::Store, key: &str) -> Result<Session, error::Error> {
     Ok(store
         .bucket::<&str, kv::Json<Session>>(Some(BUCKET_NAME))?
         .get(key)?
-        .map(kv::Codec::into_inner)
+        .map(kv::Codec::to_inner)
         .unwrap_or_default())
 }
 

proxy/coco/Cargo.toml

@@ -12,7 +12,6 @@ repository = "git@github.com:radicle-dev/radicle-upstream.git"
 
 [dependencies]
 futures = { version = "0.3", features = [ "compat" ] }
-kv = { version = "0.22", features = [ "json-value" ] }
 lazy_static = "1.4"
 log = "0.4"
 nonempty = "0.5"
@@ -21,6 +20,11 @@ syntect = "4.2"
 thiserror = "1.0"
 tokio = { version = "0.2", features = [ "dns", "macros", "time" ] }
 
+[dependencies.kv]
+git = "https://github.com/zshipko/rust-kv.git"
+rev = "a98e1ace84b22ceaac276abf796633bd8e735500"
+features = [ "json-value" ]
+
 [dependencies.librad]
 git = "https://github.com/radicle-dev/radicle-link.git"
 rev = "c16ce900776975e3de017af71763dc4e2e129d3f"

proxy/coco/src/peer/announcement.rs

@@ -111,7 +111,7 @@ pub fn load(store: &kv::Store) -> Result<Updates, Error> {
     let bucket = store.bucket::<&'static str, kv::Json<Updates>>(Some(BUCKET_NAME))?;
     let value = bucket
         .get(KEY_NAME)?
-        .map_or(HashSet::new(), kv::Json::into_inner);
+        .map_or(HashSet::new(), kv::Json::to_inner);
 
     Ok(value)
 }