diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2019-02-20 16:48:12 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-20 16:48:12 +0800 |
| commit | c942700427557e3ff6de3aaf6b916e2f056c1ec2 (patch) | |
| tree | cadf68e7206d6de42b1eefc6967214cf86e35ff2 /swarm/state | |
| parent | 7fa3509e2eaf1a4ebc12344590e5699406690f15 (diff) | |
| parent | cde35439e058b4f9579830fec9fb65ae0b998346 (diff) | |
| download | dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar.gz dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar.bz2 dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar.lz dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar.xz dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.tar.zst dexon-c942700427557e3ff6de3aaf6b916e2f056c1ec2.zip | |
Merge pull request #19029 from holiman/update1.8
Update1.8
Diffstat (limited to 'swarm/state')
| -rw-r--r-- | swarm/state/dbstore.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/swarm/state/dbstore.go b/swarm/state/dbstore.go index 147e34b23..1b541e785 100644 --- a/swarm/state/dbstore.go +++ b/swarm/state/dbstore.go @@ -88,18 +88,15 @@ func (s *DBStore) Get(key string, i interface{}) (err error) { // Put stores an object that implements Binary for a specific key. func (s *DBStore) Put(key string, i interface{}) (err error) { var bytes []byte - - marshaler, ok := i.(encoding.BinaryMarshaler) - if !ok { - if bytes, err = json.Marshal(i); err != nil { + if marshaler, ok := i.(encoding.BinaryMarshaler); ok { + if bytes, err = marshaler.MarshalBinary(); err != nil { return err } } else { - if bytes, err = marshaler.MarshalBinary(); err != nil { + if bytes, err = json.Marshal(i); err != nil { return err } } - return s.db.Put([]byte(key), bytes, nil) } |