fix: it should upgrade version to use a new protobuf format: bitstr i…

…s only available in 0.5.12
openacid · Jan 27, 2021 · 1e05180 · 1e05180
1 parent 2233d9d
commit 1e05180
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 16 deletions.
diff --git a/trie/slimtrie.go b/trie/slimtrie.go
@@ -175,6 +175,7 @@ func (st *SlimTrie) compatibleVersions() []string {
 		"==0.5.8",
 		"==0.5.9",
 		"==0.5.10",
+		"==0.5.11",
 		"==" + slimtrieVersion,
 	}
 }

diff --git a/trie/slimtrie_marshal.go b/trie/slimtrie_marshal.go
@@ -59,13 +59,15 @@ func (st *SlimTrie) Unmarshal(buf []byte) error {
 
 	// 0.5.10 and 0.5.11 share the same protobuf format:
 
-	if vers.Check(ver, slimtrieVersion, "0.5.10") {
+	if vers.Check(ver, slimtrieVersion, "==0.5.10", "==0.5.11") {
 		_, _, err := pbcmpl.Unmarshal(reader, st.inner)
 		if err != nil {
 			return errors.WithMessage(err, "failed to unmarshal inner")
 		}
 
-		before000512InnerPrefixTobitstr(st)
+		if vers.Check(ver, "<0.5.12") {
+			before000512InnerPrefixTobitstr(st)
+		}
 
 		st.init()
 		return nil

diff --git a/trie/slimtrie_marshal_test.go b/trie/slimtrie_marshal_test.go
@@ -58,7 +58,7 @@ func TestSlimTrie_Unmarshal_incompatible(t *testing.T) {
 		want  error
 	}{
 		{slimtrieVersion, nil},
-		{"0.5.12", ErrIncompatible},
+		{"0.5.13", ErrIncompatible},
 		{"0.6.0", ErrIncompatible},
 		{"0.9.9", ErrIncompatible},
 		{"1.0.1", ErrIncompatible},
@@ -157,23 +157,48 @@ func TestSlimTrie_Marshal_allkeys(t *testing.T) {
 		ta := require.New(t)
 
 		values := makeI32s(len(keys))
-		st, err := NewSlimTrie(encode.I32{}, keys, values)
-		ta.NoError(err)
 
-		testUnknownKeysGRS(t, st, testutil.RandStrSlice(100, 0, 10))
-		testPresentKeysGet(t, st, keys, values)
+		t.Run("Default", func(t *testing.T) {
+			st, err := NewSlimTrie(encode.I32{}, keys, values)
+			ta.NoError(err)
+
+			testUnknownKeysGRS(t, st, testutil.RandStrSlice(100, 0, 10))
+			testPresentKeysGet(t, st, keys, values)
+
+			buf, err := proto.Marshal(st)
+			ta.NoError(err)
+
+			st2, err := NewSlimTrie(encode.I32{}, nil, nil)
+			ta.NoError(err)
+
+			err = proto.Unmarshal(buf, st2)
+			ta.NoError(err)
+
+			testUnknownKeysGRS(t, st2, testutil.RandStrSlice(100, 0, 10))
+			testPresentKeysGet(t, st2, keys, values)
+		})
 
-		buf, err := proto.Marshal(st)
-		ta.NoError(err)
+		t.Run("Complete", func(t *testing.T) {
+			st, err := NewSlimTrie(encode.I32{}, keys, values,
+				Opt{Complete: Bool(true)})
+			ta.NoError(err)
 
-		st2, err := NewSlimTrie(encode.I32{}, nil, nil)
-		ta.NoError(err)
+			testAbsentKeysGRS(t, st, keys)
+			testPresentKeysGet(t, st, keys, values)
 
-		err = proto.Unmarshal(buf, st2)
-		ta.NoError(err)
+			buf, err := proto.Marshal(st)
+			ta.NoError(err)
+
+			st2, err := NewSlimTrie(encode.I32{}, nil, nil)
+			ta.NoError(err)
+
+			err = proto.Unmarshal(buf, st2)
+			ta.NoError(err)
+
+			testAbsentKeysGRS(t, st2, keys)
+			testPresentKeysGet(t, st2, keys, values)
+		})
 
-		testUnknownKeysGRS(t, st2, testutil.RandStrSlice(100, 0, 10))
-		testPresentKeysGet(t, st2, keys, values)
 	})
 }
 

diff --git a/trie/slimtrie_ver.go b/trie/slimtrie_ver.go
@@ -1,3 +1,3 @@
 package trie
 
-const slimtrieVersion = "0.5.11"
+const slimtrieVersion = "0.5.12"