baptiste/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

Branch out garage_model from 0.1.0 to fix incompatibility with garage_util 0.1.1

Browse source
This commit is contained in:
Alex 2021-01-15 18:21:51 +01:00
parent 3b0b11085e
commit c21317dc58
4 changed files with 494 additions and 826 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1310
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

4
Cargo.toml
View file

@ -4,8 +4,8 @@ members = [
"src/rpc", "src/rpc",
"src/table", "src/table",
"src/model", "src/model",
"src/api", #"src/api",
"src/garage", #"src/garage",
] ]
[profile.dev] [profile.dev]

4
src/model/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "garage_model" name = "garage_model_010b"
version = "0.1.0" version = "0.0.1"
authors = ["Alex Auvolat <alex@adnab.me>"] authors = ["Alex Auvolat <alex@adnab.me>"]
edition = "2018" edition = "2018"
license = "GPL-3.0" license = "GPL-3.0"

2
src/model/block.rs
View file

@ -123,7 +123,7 @@ impl BlockManager {
Message::PutBlock(m) => self.write_block(&m.hash, &m.data).await, Message::PutBlock(m) => self.write_block(&m.hash, &m.data).await,
Message::GetBlock(h) => self.read_block(h).await, Message::GetBlock(h) => self.read_block(h).await,
Message::NeedBlockQuery(h) => self.need_block(h).await.map(Message::NeedBlockReply), Message::NeedBlockQuery(h) => self.need_block(h).await.map(Message::NeedBlockReply),
_ => Err(Error::BadRequest(format!("Unexpected RPC message"))), _ => Err(Error::BadRPC(format!("Unexpected RPC message"))),
} }
} }