Fix some tests.

[lightning.git] / gob.go

diff --git a/gob.go b/gob.go
index 907c7befcbb2570fcb2dc6ea3fbb1405074e013b..70a5d2811a7e94bf9646863ff0283d271f8beb5b 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -1,4 +1,8 @@
-package main
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package lightning
 
 import (
        "bufio"
@@ -14,6 +18,8 @@ import (
 type CompactGenome struct {
        Name     string
        Variants []tileVariantID
+       StartTag tagID
+       EndTag   tagID
 }
 
 type CompactSequence struct {
@@ -23,6 +29,7 @@ type CompactSequence struct {
 
 type TileVariant struct {
        Tag      tagID
+       Ref      bool
        Variant  tileVariantID
        Blake2b  [blake2b.Size256]byte
        Sequence []byte
@@ -48,21 +55,24 @@ func DecodeLibrary(rdr io.Reader, gz bool, cb func(*LibraryEntry) error) error {
        zrdr := ioutil.NopCloser(rdr)
        var err error
        if gz {
-               zrdr, err = pgzip.NewReader(bufio.NewReaderSize(rdr, 1<<26))
+               zrdr, err = pgzip.NewReader(bufio.NewReaderSize(rdr, 1<<20))
                if err != nil {
                        return err
                }
+               defer zrdr.Close()
        }
        dec := gob.NewDecoder(zrdr)
-       for err == nil {
+       for {
                var ent LibraryEntry
                err = dec.Decode(&ent)
-               if err == nil {
-                       err = cb(&ent)
+               if err == io.EOF {
+                       return zrdr.Close()
+               } else if err != nil {
+                       return err
+               }
+               err = cb(&ent)
+               if err != nil {
+                       return err
                }
        }
-       if err != io.EOF {
-               return err
-       }
-       return zrdr.Close()
 }