cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #297: State unmarshal

Browse Source 
It seems we have problems deserializing on top of an already
initialized state.

License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
This commit is contained in:
Hector Sanjuan 2018-01-23 22:03:06 +01:00
parent 8e487cd880
commit f94faa2ebb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
state/mapstate/map_state.go
View File

@ -12,6 +12,7 @@ import (
cid "github.com/ipfs/go-cid" cid "github.com/ipfs/go-cid"
logging "github.com/ipfs/go-log" logging "github.com/ipfs/go-log"
"github.com/ipfs/ipfs-cluster/api" "github.com/ipfs/ipfs-cluster/api"
) )
@ -150,10 +151,14 @@ func (st *MapState) Unmarshal(bs []byte) error {
// snapshot is up to date // snapshot is up to date
buf := bytes.NewBuffer(bs[1:]) buf := bytes.NewBuffer(bs[1:])
newState := MapState{}
dec := msgpack.Multicodec(msgpack.DefaultMsgpackHandle()).Decoder(buf) dec := msgpack.Multicodec(msgpack.DefaultMsgpackHandle()).Decoder(buf)
err := dec.Decode(st) err := dec.Decode(&newState)
if err != nil { if err != nil {
logger.Error(err) logger.Error(err)
} }
st.PinMap = newState.PinMap
st.Version = newState.Version
return err return err
} }