cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge remote-tracking branch 'origin/master' into next

Browse Source
This commit is contained in:
Łukasz Magiera 2020-07-23 22:48:38 +02:00
commit 774c6901a8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -19,7 +19,7 @@ All work is tracked via issues. An attempt at keeping an up-to-date view on rema
The main branches under development at the moment are: The main branches under development at the moment are:
* [`master`](https://github.com/filecoin-project/lotus): current testnet. * [`master`](https://github.com/filecoin-project/lotus): current testnet.
* [`next`](https://github.com/filecoin-project/lotus/tree/next): working branch with chain-breaking changes. * [`next`](https://github.com/filecoin-project/lotus/tree/next): working branch with chain-breaking changes.
* [`interopnet`](https://github.com/filecoin-project/lotus/tree/interopnet): devnet running one of `next` commits. * [`ntwk-calibration`](https://github.com/filecoin-project/lotus/tree/ntwk-calibration): devnet running one of `next` commits.
## License ## License

7
lib/bufbstore/buf_bstore.go
View File

@ -104,7 +104,12 @@ func (bs *BufferedBS) Get(c cid.Cid) (block.Block, error) {
} }
func (bs *BufferedBS) GetSize(c cid.Cid) (int, error) { func (bs *BufferedBS) GetSize(c cid.Cid) (int, error) {
panic("nyi") s, err := bs.read.GetSize(c)
if err == bstore.ErrNotFound || s == 0 {
return bs.write.GetSize(c)
}
return s, err
} }
func (bs *BufferedBS) Put(blk block.Block) error { func (bs *BufferedBS) Put(blk block.Block) error {