pass ci

plugin/mempool/price/cache.go

@@ -21,9 +21,9 @@ type Queue struct {
 // NewQueue 创建队列
 func NewQueue(subcfg subConfig) *Queue {
 	return &Queue{
-		txMap:     make(map[string]*skiplist.SkipValue, subcfg.PoolCacheSize),
-		txList:    skiplist.NewSkipList(&skiplist.SkipValue{-1, nil}),
-		subConfig: subcfg,
+		make(map[string]*skiplist.SkipValue, subcfg.PoolCacheSize),
+		skiplist.NewSkipList(&skiplist.SkipValue{Score: -1, Value: nil}),
+		subcfg,
 	}
 }
 

plugin/mempool/score/cache.go

@@ -22,7 +22,7 @@ type Queue struct {
 func NewQueue(subcfg subConfig) *Queue {
 	return &Queue{
 		txMap:     make(map[string]*skiplist.SkipValue, subcfg.PoolCacheSize),
-		txList:    skiplist.NewSkipList(&skiplist.SkipValue{-1, nil}),
+		txList:    skiplist.NewSkipList(&skiplist.SkipValue{Score: -1, Value: nil}),
 		subConfig: subcfg,
 	}
 }

vendor/github.com/33cn/chain33/common/skiplist/skiplist.go

@@ -39,14 +39,14 @@ type SkipList struct {
 	level        int
 }
 
-// SkipListIterator 跳跃表迭代器
-type SkipListIterator struct {
+// Iterator 跳跃表迭代器
+type Iterator struct {
 	list *SkipList
 	node *skipListNode
 }
 
 // First 获取第一个节点Value值
-func (sli *SkipListIterator) First() *SkipValue {
+func (sli *Iterator) First() *SkipValue {
 	if sli.list.header.next[0] == nil {
 		return nil
 	}
@@ -55,7 +55,7 @@ func (sli *SkipListIterator) First() *SkipValue {
 }
 
 // Last 获取最后一个节点Value值
-func (sli *SkipListIterator) Last() *SkipValue {
+func (sli *Iterator) Last() *SkipValue {
 	if sli.list.tail == nil {
 		return nil
 	}
@@ -80,7 +80,7 @@ func (node *skipListNode) Next() *skipListNode {
 }
 
 // Seek 迭代器在跳跃表中查找某个位置在传参后面或者与传参相等的SkipValue
-func (sli *SkipListIterator) Seek(value *SkipValue) *SkipValue {
+func (sli *Iterator) Seek(value *SkipValue) *SkipValue {
 	x := sli.list.find(value)
 	if x.next[0] == nil {
 		return nil
@@ -117,8 +117,8 @@ func randomLevel() int {
 }
 
 // GetIterator 获取迭代器
-func (sl *SkipList) GetIterator() *SkipListIterator {
-	it := &SkipListIterator{}
+func (sl *SkipList) GetIterator() *Iterator {
+	it := &Iterator{}
 	it.list = sl
 	it.First()
 	return it

vendor/github.com/33cn/chain33/common/skiplist/skiplist_test.go

@@ -6,11 +6,10 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-var(
-	s1=&SkipValue{1,"111"}
-	s2=&SkipValue{2,"222"}
-	s3=&SkipValue{3,"333"}
-	s4=&SkipValue{4,"444"}
+var (
+	s1 = &SkipValue{1, "111"}
+	s2 = &SkipValue{2, "222"}
+	s3 = &SkipValue{3, "333"}
 )
 
 func TestInsert(t *testing.T) {