Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bitfield improvements #506

Merged
merged 25 commits into from
Jun 26, 2020
Merged

Bitfield improvements #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
6cc25e3
Bitfield improvements
timvermeulen Jun 9, 2020
f45a1b3
Store prefix bits in separate variables
timvermeulen Jun 17, 2020
05705fb
Use the `Result` type alias in reader.rs
timvermeulen Jun 17, 2020
f1b1e3a
Merge branch 'master' into tim/bitfield
timvermeulen Jun 17, 2020
f6f4cfa
Remove unused dependency
timvermeulen Jun 18, 2020
c0108aa
Avoid creating vectors unnecessarily
timvermeulen Jun 18, 2020
b51ac97
Rename union to merge
timvermeulen Jun 18, 2020
03a3d62
Rename multi_union to union
timvermeulen Jun 18, 2020
c210ef7
Combine first access with is_empty check
timvermeulen Jun 18, 2020
16124a2
Avoid traversing `self.unset` up front in `BitField::iter`
timvermeulen Jun 19, 2020
e6d7488
Updates market actor (#496)
dutterbutter Jun 18, 2020
e14f30d
Update proofs to v4 (#507)
austinabell Jun 18, 2020
cf32890
Update bootnodes and genesis for testnet (#509)
austinabell Jun 19, 2020
5992fd5
Remove unnecessary >=
timvermeulen Jun 22, 2020
a2215d9
Get rid of redundant `get_mut`
timvermeulen Jun 22, 2020
a0e837d
Add UnverifiedBitField type in order to deserialize a bit field witho…
timvermeulen Jun 22, 2020
74ca947
Rename RLEPlus to RlePlus in accordance with Rust's naming conventions
timvermeulen Jun 22, 2020
f2104c6
Merge branch 'master' into tim/bitfield
timvermeulen Jun 22, 2020
75f1ba7
Remove pointless mutable reference
timvermeulen Jun 24, 2020
802fa4b
Remove UnverifiedBitField
timvermeulen Jun 24, 2020
8784836
Make sure that RlePlus::new returns an error on integer overflow
timvermeulen Jun 24, 2020
3e878dc
Don't yield a run of length 0 whenever a short block has the value 0
timvermeulen Jun 24, 2020
9bf7488
Merge branch 'master' into tim/bitfield
timvermeulen Jun 25, 2020
d9930e2
Merge branch 'main' into tim/bitfield
timvermeulen Jun 25, 2020
69dea89
Merge branch 'main' into tim/bitfield
timvermeulen Jun 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions blockchain/state_manager/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,9 @@ fn get_proving_set_raw<DB>(
where
DB: BlockStore,
{
let mut not_proving = actor_state
.faults
.clone()
.merge(&actor_state.recoveries)
.map_err(|_| Error::Other("Could not merge bitfield".to_string()))?;
let not_proving = &actor_state.faults | &actor_state.recoveries;

actor_state
.load_sector_infos(&*state_manager.get_block_store(), &mut not_proving)
.load_sector_infos(&*state_manager.get_block_store(), &not_proving)
.map_err(|err| Error::Other(format!("failed to get proving set :{:}", err)))
}
2 changes: 1 addition & 1 deletion utils/bitfield/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ bitvec = "0.17.3"
unsigned-varint = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_bytes = "0.11.3"
fnv = "1.0.6"
ahash = "0.3"

[dev-dependencies]
rand_xorshift = "0.2.0"
Expand Down
80 changes: 0 additions & 80 deletions utils/bitfield/src/bitvec_serde.rs
View file
Open in desktop

This file was deleted.

Loading