tsarevvv/rust-ipfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(unix): split test_support with FakeBlockstore

Browse Source
This commit is contained in:
Joonas Koivunen 2020-06-17 11:52:08 +03:00
parent f5ada8728d
commit d589e90160
5 changed files with 122 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unixfs/src/dir.rs
View File

@ -228,7 +228,7 @@ impl MultipleMatchingLinks {
mod tests {
use super::{resolve, MaybeResolved};
use crate::file::tests::FakeBlockstore;
use crate::test_support::FakeBlockstore;
use cid::Cid;
use hex_literal::hex;
use std::convert::TryFrom;

119
unixfs/src/file.rs
View File

@ -178,12 +178,9 @@ impl<'a> UnwrapBorrowedExt<'a> for Option<Cow<'a, [u8]>> {
#[cfg(test)]
pub(crate) mod tests {
use cid::Cid;
use std::collections::HashMap;
use std::convert::TryFrom;
use super::{reader::*, visit::*, UnwrapBorrowedExt};
use hex_literal::hex;
use crate::test_support::FakeBlockstore;
const CONTENT_FILE: &[u8] = &hex!("0a0d08021207636f6e74656e741807");
@ -221,120 +218,6 @@ pub(crate) mod tests {
assert!(matches!(content, FileContent::Bytes(b"")), "{:?}", content);
}
#[derive(Default)]
#[cfg(test)]
pub(crate) struct FakeBlockstore {
blocks: HashMap<Cid, Vec<u8>>,
}
#[cfg(test)]
impl FakeBlockstore {
pub fn get_by_cid<'a>(&'a self, cid: &Cid) -> &'a [u8] {
self.blocks
.get(cid)
.unwrap_or_else(|| panic!("cid not found: {}", cid))
}
pub fn get_by_raw<'a>(&'a self, key: &[u8]) -> &'a [u8] {
self.get_by_cid(&Cid::try_from(key).unwrap())
}
pub fn get_by_str<'a>(&'a self, key: &str) -> &'a [u8] {
self.get_by_cid(&Cid::try_from(key).unwrap())
}
pub fn insert_v0(&mut self, block: &[u8]) -> Cid {
use sha2::Digest;
let mut sha = sha2::Sha256::new();
sha.input(block);
let result = sha.result();
let mh = multihash::wrap(multihash::Code::Sha2_256, &result[..]);
let cid = Cid::new_v0(mh).unwrap();
assert!(
self.blocks.insert(cid.clone(), block.to_vec()).is_none(),
"duplicate cid {}",
cid
);
cid
}
pub fn with_fixtures() -> Self {
let mut this = Self::default();
let foobar_blocks: &[&[u8]] = &[
// root for "foobar\n" from go-ipfs 0.5 add -s size-2
// root
// |
// ----+-----
// | | | |
// fo ob ar \n
// QmRJHYTNvC3hmd9gJQARxLR1QMEincccBV53bBw524yyq6
&hex!("12280a221220fef9fe1804942b35e19e145a03f9c9d5ca9c997dda0a9416f3f515a52f1b3ce11200180a12280a221220dfb94b75acb208fd4873d84872af58bd65c731770a7d4c0deeb4088e87390bfe1200180a12280a221220054497ae4e89812c83276a48e3e679013a788b7c0eb02712df15095c02d6cd2c1200180a12280a221220cc332ceb37dea7d3d7c00d1393117638d3ed963575836c6d44a24951e444cf5d120018090a0c080218072002200220022001"),
// first bytes: fo
&hex!("0a0808021202666f1802"),
// ob
&hex!("0a08080212026f621802"),
// ar
&hex!("0a080802120261721802"),
// \n
&hex!("0a07080212010a1801"),
// same "foobar\n" but with go-ipfs 0.5 add --trickle -s size-2
// QmWfQ48ChJUj4vWKFsUDe4646xCBmXgdmNfhjz9T7crywd
&hex!("12280a2212200f20a024ce0152161bc23e7234573374dfc3999143deaebf9b07b9c67318f9bd1200180a12280a221220b424253c25b5a7345fc7945732e363a12a790341b7c2d758516bbad5bbaab4461200180a12280a221220b7ab6350c604a885be9bd72d833f026b1915d11abe7e8dda5d0bca689342b7411200180a12280a221220a8a826652c2a3e93a751456e71139df086a1fedfd3bd9f232ad52ea1d813720e120018090a0c080218072002200220022001"),
// the blocks have type raw instead of file, for some unknown reason
&hex!("0a0808001202666f1802"),
&hex!("0a08080012026f621802"),
&hex!("0a080800120261721802"),
&hex!("0a07080012010a1801"),
// directory of the above two: QmVkvLsSEm2uJx1h5Fqukje8mMPYg393o5C2kMCkF2bBTA
&hex!("12380a2212202bf7f75b76e336f34a04abd86af423b5063628ffd91e5392444078851dc31655120f666f6f6261722e62616c616e63656418dd0112370a2212207baaf5e250ba1352f97eddc95840705890dc5d3fc37084a4c1aa052abcf4ac58120e666f6f6261722e747269636b6c6518dd010a020801"),
// a directory with the above directory of two: QmPTotyhVnnfCu9R4qwR4cdhpi5ENaiP8ZJfdqsm8Dw2jB
&hex!("12570a2212206e396cd762f0ab55cc48e10b3c9d5a8428fc2888f4ccda86b72d6aa9fc020cb5122e516d566b764c7353456d32754a783168354671756b6a65386d4d5059673339336f3543326b4d436b46326242544118b1040a020801"),
// sharded directory where all are collisions with small number of links, each
// bucket has two links: QmZbFPTnDBMWbQ6iBxQAhuhLz8Nu9XptYS96e7cuf5wvbk
&hex!("122b0a221220904e1485d68b56a71f79d44cd306d536ee52adb6a90c29b6a1fa95a504a038f71202303718b501122b0a221220772026a2c0e021710f8d0d8f72080255d5133556d3ae881e3405e673692f79a81202313318b001122b0a22122075e9df118a625120006c63b75c8f25f1e28397555ccf8c107029332d5e9b648a1202353418aa01122b0a221220db916fd000e12decdf0724965cbf419233a187ae415d59fbafea2c3851e584ad1202353618b101122b0a2212209adc67f730bd8b2f7eff8f2910ec8391814da9d7ae08d076165a9832bce99f921202383218af01122b0a221220bb48edba8f029483a6983ba70aef2cd86d14aa633f33007ce175680105da8d811202433118af01122b0a22122047b1f317152eb425d878e5e3577dd7c40af4bc2b005083c4bc9ec19157a8605c1202443418a601122b0a2212207b7e161cf9246d7fca2e2986aac98bbf2fef4f13f6fea497fc8f43d8899e0de51202463118a6010a280805121f020000001000020000000000000004000000000050000000000000000800802822308002"),
// file linked to by all names (empty): QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH
&hex!("0a0408021800"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121534386c6f6e672d6e616d65642d66696c652d3031361806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121546426c6f6e672d6e616d65642d66696c652d30333718060a290805122008000000000000000000000000000000000000000000010000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538376c6f6e672d6e616d65642d66696c652d3035381806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121544446c6f6e672d6e616d65642d66696c652d30303918060a250805121c200000000000000000000080000000000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536396c6f6e672d6e616d65642d66696c652d3033381806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121544356c6f6e672d6e616d65642d66696c652d30353018060a240805121b2000000000000000000000000002000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121532416c6f6e672d6e616d65642d66696c652d3034391806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543436c6f6e672d6e616d65642d66696c652d30303418060a230805121a10000000000000000000000000000000000000000400000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543346c6f6e672d6e616d65642d66696c652d3032351806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543416c6f6e672d6e616d65642d66696c652d30333418060a230805121a04100000000000000000000000000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121534356c6f6e672d6e616d65642d66696c652d3034311806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121541366c6f6e672d6e616d65642d66696c652d30333318060a1e080512154000000000000000000000002000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536396c6f6e672d6e616d65642d66696c652d3031371806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538306c6f6e672d6e616d65642d66696c652d30343018060a1a0805121101000002000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536376c6f6e672d6e616d65642d66696c652d3030331806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538356c6f6e672d6e616d65642d66696c652d30343818060a1a0805121120000000800000000000000000000000002822308002"),
// symlink linking to "foobar": QmNgQEdXVdLw79nH2bnxLMxnyWMaXrijfqMTiDVat3iyuz
&hex!("0a0a08041206666f6f626172"),
// sharded directory with single link to a non-sharded directory
// QmQXUANxYGpkwMTWQUdZBPx9jqfFP7acNgL4FHRWkndKCe
&hex!("12390a2212209b04586b8bdc01a7e0db04b8358a3717954572720f6b6803af5eec781cf73801121146416e6f6e5f736861726465645f64697218430a290805122004000000000000000000000000000000000000000000000000000000000000002822308002"),
// the non-sharded directory linked by the the above sharded directory
// QmYmmkD3dGZjuozuqSzDYjU4ZyhAgc4T4P4SUgY6qjzBi8
&hex!("122e0a22122031c3d57080d8463a3c63b2923df5a1d40ad7a73eae5a14af584213e5f504ac331206666f6f626172180f0a020801"),
// single block version of "foobar\n" linked to by above non-sharded directory
&hex!("0a0d08021207666f6f6261720a1807"),
];
for block in foobar_blocks {
this.insert_v0(block);
}
this
}
}
#[test]
fn balanced_traversal() {
let target = "QmRJHYTNvC3hmd9gJQARxLR1QMEincccBV53bBw524yyq6";

3
unixfs/src/lib.rs
View File

@ -21,6 +21,9 @@ pub mod dagpb;
/// Support for walking over all UnixFs trees.
pub mod walk;
#[cfg(test)]
pub(crate) mod test_support;
/// A link could not be transformed into a Cid.
#[derive(Debug)]
pub struct InvalidCidInLink {

116
unixfs/src/test_support.rs Normal file
View File

@ -0,0 +1,116 @@
use cid::Cid;
use std::collections::HashMap;
use std::convert::TryFrom;
use hex_literal::hex;
#[derive(Default)]
pub struct FakeBlockstore {
blocks: HashMap<Cid, Vec<u8>>,
}
impl FakeBlockstore {
pub fn get_by_cid<'a>(&'a self, cid: &Cid) -> &'a [u8] {
self.blocks
.get(cid)
.unwrap_or_else(|| panic!("cid not found: {}", cid))
}
pub fn get_by_raw<'a>(&'a self, key: &[u8]) -> &'a [u8] {
self.get_by_cid(&Cid::try_from(key).unwrap())
}
pub fn get_by_str<'a>(&'a self, key: &str) -> &'a [u8] {
self.get_by_cid(&Cid::try_from(key).unwrap())
}
pub fn insert_v0(&mut self, block: &[u8]) -> Cid {
use sha2::Digest;
let mut sha = sha2::Sha256::new();
sha.input(block);
let result = sha.result();
let mh = multihash::wrap(multihash::Code::Sha2_256, &result[..]);
let cid = Cid::new_v0(mh).unwrap();
assert!(
self.blocks.insert(cid.clone(), block.to_vec()).is_none(),
"duplicate cid {}",
cid
);
cid
}
pub fn with_fixtures() -> Self {
let mut this = Self::default();
let foobar_blocks: &[&[u8]] = &[
// root for "foobar\n" from go-ipfs 0.5 add -s size-2
// root
// |
// ----+-----
// | | | |
// fo ob ar \n
// QmRJHYTNvC3hmd9gJQARxLR1QMEincccBV53bBw524yyq6
&hex!("12280a221220fef9fe1804942b35e19e145a03f9c9d5ca9c997dda0a9416f3f515a52f1b3ce11200180a12280a221220dfb94b75acb208fd4873d84872af58bd65c731770a7d4c0deeb4088e87390bfe1200180a12280a221220054497ae4e89812c83276a48e3e679013a788b7c0eb02712df15095c02d6cd2c1200180a12280a221220cc332ceb37dea7d3d7c00d1393117638d3ed963575836c6d44a24951e444cf5d120018090a0c080218072002200220022001"),
// first bytes: fo
&hex!("0a0808021202666f1802"),
// ob
&hex!("0a08080212026f621802"),
// ar
&hex!("0a080802120261721802"),
// \n
&hex!("0a07080212010a1801"),
// same "foobar\n" but with go-ipfs 0.5 add --trickle -s size-2
// QmWfQ48ChJUj4vWKFsUDe4646xCBmXgdmNfhjz9T7crywd
&hex!("12280a2212200f20a024ce0152161bc23e7234573374dfc3999143deaebf9b07b9c67318f9bd1200180a12280a221220b424253c25b5a7345fc7945732e363a12a790341b7c2d758516bbad5bbaab4461200180a12280a221220b7ab6350c604a885be9bd72d833f026b1915d11abe7e8dda5d0bca689342b7411200180a12280a221220a8a826652c2a3e93a751456e71139df086a1fedfd3bd9f232ad52ea1d813720e120018090a0c080218072002200220022001"),
// the blocks have type raw instead of file, for some unknown reason
&hex!("0a0808001202666f1802"),
&hex!("0a08080012026f621802"),
&hex!("0a080800120261721802"),
&hex!("0a07080012010a1801"),
// directory of the above two: QmVkvLsSEm2uJx1h5Fqukje8mMPYg393o5C2kMCkF2bBTA
&hex!("12380a2212202bf7f75b76e336f34a04abd86af423b5063628ffd91e5392444078851dc31655120f666f6f6261722e62616c616e63656418dd0112370a2212207baaf5e250ba1352f97eddc95840705890dc5d3fc37084a4c1aa052abcf4ac58120e666f6f6261722e747269636b6c6518dd010a020801"),
// a directory with the above directory of two: QmPTotyhVnnfCu9R4qwR4cdhpi5ENaiP8ZJfdqsm8Dw2jB
&hex!("12570a2212206e396cd762f0ab55cc48e10b3c9d5a8428fc2888f4ccda86b72d6aa9fc020cb5122e516d566b764c7353456d32754a783168354671756b6a65386d4d5059673339336f3543326b4d436b46326242544118b1040a020801"),
// sharded directory where all are collisions with small number of links, each
// bucket has two links: QmZbFPTnDBMWbQ6iBxQAhuhLz8Nu9XptYS96e7cuf5wvbk
&hex!("122b0a221220904e1485d68b56a71f79d44cd306d536ee52adb6a90c29b6a1fa95a504a038f71202303718b501122b0a221220772026a2c0e021710f8d0d8f72080255d5133556d3ae881e3405e673692f79a81202313318b001122b0a22122075e9df118a625120006c63b75c8f25f1e28397555ccf8c107029332d5e9b648a1202353418aa01122b0a221220db916fd000e12decdf0724965cbf419233a187ae415d59fbafea2c3851e584ad1202353618b101122b0a2212209adc67f730bd8b2f7eff8f2910ec8391814da9d7ae08d076165a9832bce99f921202383218af01122b0a221220bb48edba8f029483a6983ba70aef2cd86d14aa633f33007ce175680105da8d811202433118af01122b0a22122047b1f317152eb425d878e5e3577dd7c40af4bc2b005083c4bc9ec19157a8605c1202443418a601122b0a2212207b7e161cf9246d7fca2e2986aac98bbf2fef4f13f6fea497fc8f43d8899e0de51202463118a6010a280805121f020000001000020000000000000004000000000050000000000000000800802822308002"),
// file linked to by all names (empty): QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH
&hex!("0a0408021800"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121534386c6f6e672d6e616d65642d66696c652d3031361806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121546426c6f6e672d6e616d65642d66696c652d30333718060a290805122008000000000000000000000000000000000000000000010000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538376c6f6e672d6e616d65642d66696c652d3035381806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121544446c6f6e672d6e616d65642d66696c652d30303918060a250805121c200000000000000000000080000000000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536396c6f6e672d6e616d65642d66696c652d3033381806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121544356c6f6e672d6e616d65642d66696c652d30353018060a240805121b2000000000000000000000000002000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121532416c6f6e672d6e616d65642d66696c652d3034391806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543436c6f6e672d6e616d65642d66696c652d30303418060a230805121a10000000000000000000000000000000000000000400000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543346c6f6e672d6e616d65642d66696c652d3032351806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121543416c6f6e672d6e616d65642d66696c652d30333418060a230805121a04100000000000000000000000000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121534356c6f6e672d6e616d65642d66696c652d3034311806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121541366c6f6e672d6e616d65642d66696c652d30333318060a1e080512154000000000000000000000002000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536396c6f6e672d6e616d65642d66696c652d3031371806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538306c6f6e672d6e616d65642d66696c652d30343018060a1a0805121101000002000000000000000000000000002822308002"),
&hex!("123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121536376c6f6e672d6e616d65642d66696c652d3030331806123d0a221220bfccda787baba32b59c78450ac3d20b633360b43992c77289f9ed46d843561e6121538356c6f6e672d6e616d65642d66696c652d30343818060a1a0805121120000000800000000000000000000000002822308002"),
// symlink linking to "foobar": QmNgQEdXVdLw79nH2bnxLMxnyWMaXrijfqMTiDVat3iyuz
&hex!("0a0a08041206666f6f626172"),
// sharded directory with single link to a non-sharded directory
// QmQXUANxYGpkwMTWQUdZBPx9jqfFP7acNgL4FHRWkndKCe
&hex!("12390a2212209b04586b8bdc01a7e0db04b8358a3717954572720f6b6803af5eec781cf73801121146416e6f6e5f736861726465645f64697218430a290805122004000000000000000000000000000000000000000000000000000000000000002822308002"),
// the non-sharded directory linked by the the above sharded directory
// QmYmmkD3dGZjuozuqSzDYjU4ZyhAgc4T4P4SUgY6qjzBi8
&hex!("122e0a22122031c3d57080d8463a3c63b2923df5a1d40ad7a73eae5a14af584213e5f504ac331206666f6f626172180f0a020801"),
// single block version of "foobar\n" linked to by above non-sharded directory
&hex!("0a0d08021207666f6f6261720a1807"),
];
for block in foobar_blocks {
this.insert_v0(block);
}
this
}
}

2
unixfs/src/walk.rs
View File

@ -788,7 +788,7 @@ impl std::error::Error for Error {}
#[cfg(test)]
mod tests {
use super::*;
use crate::file::tests::FakeBlockstore;
use crate::test_support::FakeBlockstore;
use std::collections::HashMap;
use std::path::PathBuf;