mirror of https://github.com/poanetwork/gecko.git
Merge branch 'master' of github.com:ava-labs/gecko-internal
This commit is contained in:
commit
0270a485e6
|
@ -10,6 +10,10 @@ import (
|
|||
"github.com/ava-labs/gecko/ids"
|
||||
)
|
||||
|
||||
const (
|
||||
minCacheSize = 32
|
||||
)
|
||||
|
||||
type entry struct {
|
||||
Key ids.ID
|
||||
Value interface{}
|
||||
|
@ -59,7 +63,7 @@ func (c *LRU) Flush() {
|
|||
|
||||
func (c *LRU) init() {
|
||||
if c.entryMap == nil {
|
||||
c.entryMap = make(map[[32]byte]*list.Element)
|
||||
c.entryMap = make(map[[32]byte]*list.Element, minCacheSize)
|
||||
}
|
||||
if c.entryList == nil {
|
||||
c.entryList = list.New()
|
||||
|
@ -134,6 +138,6 @@ func (c *LRU) evict(key ids.ID) {
|
|||
func (c *LRU) flush() {
|
||||
c.init()
|
||||
|
||||
c.entryMap = make(map[[32]byte]*list.Element)
|
||||
c.entryMap = make(map[[32]byte]*list.Element, minCacheSize)
|
||||
c.entryList = list.New()
|
||||
}
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
package cache
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"testing"
|
||||
|
||||
"github.com/ava-labs/gecko/ids"
|
||||
)
|
||||
|
||||
func BenchmarkLRUCachePutSmall(b *testing.B) {
|
||||
smallLen := 5
|
||||
cache := &LRU{Size: smallLen}
|
||||
for n := 0; n < b.N; n++ {
|
||||
for i := 0; i < smallLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
cache.Put(ids.NewID(idBytes), n)
|
||||
}
|
||||
b.StopTimer()
|
||||
cache.Flush()
|
||||
b.StartTimer()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkLRUCachePutMedium(b *testing.B) {
|
||||
mediumLen := 250
|
||||
cache := &LRU{Size: mediumLen}
|
||||
for n := 0; n < b.N; n++ {
|
||||
for i := 0; i < mediumLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
cache.Put(ids.NewID(idBytes), n)
|
||||
}
|
||||
b.StopTimer()
|
||||
cache.Flush()
|
||||
b.StartTimer()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkLRUCachePutLarge(b *testing.B) {
|
||||
largeLen := 10000
|
||||
cache := &LRU{Size: largeLen}
|
||||
for n := 0; n < b.N; n++ {
|
||||
for i := 0; i < largeLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
cache.Put(ids.NewID(idBytes), n)
|
||||
}
|
||||
b.StopTimer()
|
||||
cache.Flush()
|
||||
b.StartTimer()
|
||||
}
|
||||
}
|
|
@ -50,6 +50,122 @@ func (c *Config) init() error {
|
|||
|
||||
// Hard coded genesis constants
|
||||
var (
|
||||
EverestConfig = Config{
|
||||
MintAddresses: []string{
|
||||
"95YUFjhDG892VePMzpwKF9JzewGKvGRi3",
|
||||
},
|
||||
FundedAddresses: []string{
|
||||
"9uKvvA7E35QCwLvAaohXTCfFejbf3Rv17",
|
||||
"JLrYNMYXANGj43BfWXBxMMAEenUBp1Sbn",
|
||||
"7TUTzwrU6nbZtWHjTHEpdneUvjKBxb3EM",
|
||||
"77mPUXBdQKwQpPoX6rckCZGLGGdkuG1G6",
|
||||
"4gGWdFZ4Gax1B466YKXyKRRpWLb42Afdt",
|
||||
"CKTkzAPsRxCreyiDTnjGxLmjMarxF28fi",
|
||||
"4ABm9gFHVtsNdcKSd1xsacFkGneSgzpaa",
|
||||
"DpL8PTsrjtLzv5J8LL3D2A6YcnCTqrNH9",
|
||||
"ZdhZv6oZrmXLyFDy6ovXAu6VxmbTsT2h",
|
||||
"6cesTteH62Y5mLoDBUASaBvCXuL2AthL",
|
||||
},
|
||||
StakerIDs: []string{
|
||||
"LQwRLm4cbJ7T2kxcxp4uXCU5XD8DFrE1C",
|
||||
"hArafGhY2HFTbwaaVh1CSCUCUCiJ2Vfb",
|
||||
"2m38qc95mhHXtrhjyGbe7r2NhniqHHJRB",
|
||||
"4QBwET5o8kUhvt9xArhir4d3R25CtmZho",
|
||||
"NpagUxt6KQiwPch9Sd4osv8kD1TZnkjdk",
|
||||
},
|
||||
EVMBytes: []byte{
|
||||
0x7b, 0x22, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
|
||||
0x22, 0x3a, 0x7b, 0x22, 0x63, 0x68, 0x61, 0x69,
|
||||
0x6e, 0x49, 0x64, 0x22, 0x3a, 0x34, 0x33, 0x31,
|
||||
0x31, 0x30, 0x2c, 0x22, 0x68, 0x6f, 0x6d, 0x65,
|
||||
0x73, 0x74, 0x65, 0x61, 0x64, 0x42, 0x6c, 0x6f,
|
||||
0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22, 0x64,
|
||||
0x61, 0x6f, 0x46, 0x6f, 0x72, 0x6b, 0x42, 0x6c,
|
||||
0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
|
||||
0x64, 0x61, 0x6f, 0x46, 0x6f, 0x72, 0x6b, 0x53,
|
||||
0x75, 0x70, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x3a,
|
||||
0x74, 0x72, 0x75, 0x65, 0x2c, 0x22, 0x65, 0x69,
|
||||
0x70, 0x31, 0x35, 0x30, 0x42, 0x6c, 0x6f, 0x63,
|
||||
0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22, 0x65, 0x69,
|
||||
0x70, 0x31, 0x35, 0x30, 0x48, 0x61, 0x73, 0x68,
|
||||
0x22, 0x3a, 0x22, 0x30, 0x78, 0x32, 0x30, 0x38,
|
||||
0x36, 0x37, 0x39, 0x39, 0x61, 0x65, 0x65, 0x62,
|
||||
0x65, 0x61, 0x65, 0x31, 0x33, 0x35, 0x63, 0x32,
|
||||
0x34, 0x36, 0x63, 0x36, 0x35, 0x30, 0x32, 0x31,
|
||||
0x63, 0x38, 0x32, 0x62, 0x34, 0x65, 0x31, 0x35,
|
||||
0x61, 0x32, 0x63, 0x34, 0x35, 0x31, 0x33, 0x34,
|
||||
0x30, 0x39, 0x39, 0x33, 0x61, 0x61, 0x63, 0x66,
|
||||
0x64, 0x32, 0x37, 0x35, 0x31, 0x38, 0x38, 0x36,
|
||||
0x35, 0x31, 0x34, 0x66, 0x30, 0x22, 0x2c, 0x22,
|
||||
0x65, 0x69, 0x70, 0x31, 0x35, 0x35, 0x42, 0x6c,
|
||||
0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
|
||||
0x65, 0x69, 0x70, 0x31, 0x35, 0x38, 0x42, 0x6c,
|
||||
0x6f, 0x63, 0x6b, 0x22, 0x3a, 0x30, 0x2c, 0x22,
|
||||
0x62, 0x79, 0x7a, 0x61, 0x6e, 0x74, 0x69, 0x75,
|
||||
0x6d, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x3a,
|
||||
0x30, 0x2c, 0x22, 0x63, 0x6f, 0x6e, 0x73, 0x74,
|
||||
0x61, 0x6e, 0x74, 0x69, 0x6e, 0x6f, 0x70, 0x6c,
|
||||
0x65, 0x42, 0x6c, 0x6f, 0x63, 0x6b, 0x22, 0x3a,
|
||||
0x30, 0x2c, 0x22, 0x70, 0x65, 0x74, 0x65, 0x72,
|
||||
0x73, 0x62, 0x75, 0x72, 0x67, 0x42, 0x6c, 0x6f,
|
||||
0x63, 0x6b, 0x22, 0x3a, 0x30, 0x7d, 0x2c, 0x22,
|
||||
0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x22, 0x3a, 0x22,
|
||||
0x30, 0x78, 0x30, 0x22, 0x2c, 0x22, 0x74, 0x69,
|
||||
0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x22,
|
||||
0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
|
||||
0x65, 0x78, 0x74, 0x72, 0x61, 0x44, 0x61, 0x74,
|
||||
0x61, 0x22, 0x3a, 0x22, 0x30, 0x78, 0x30, 0x30,
|
||||
0x22, 0x2c, 0x22, 0x67, 0x61, 0x73, 0x4c, 0x69,
|
||||
0x6d, 0x69, 0x74, 0x22, 0x3a, 0x22, 0x30, 0x78,
|
||||
0x35, 0x66, 0x35, 0x65, 0x31, 0x30, 0x30, 0x22,
|
||||
0x2c, 0x22, 0x64, 0x69, 0x66, 0x66, 0x69, 0x63,
|
||||
0x75, 0x6c, 0x74, 0x79, 0x22, 0x3a, 0x22, 0x30,
|
||||
0x78, 0x30, 0x22, 0x2c, 0x22, 0x6d, 0x69, 0x78,
|
||||
0x48, 0x61, 0x73, 0x68, 0x22, 0x3a, 0x22, 0x30,
|
||||
0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x22, 0x2c, 0x22, 0x63, 0x6f, 0x69, 0x6e,
|
||||
0x62, 0x61, 0x73, 0x65, 0x22, 0x3a, 0x22, 0x30,
|
||||
0x78, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x22, 0x2c, 0x22, 0x61, 0x6c, 0x6c, 0x6f,
|
||||
0x63, 0x22, 0x3a, 0x7b, 0x22, 0x35, 0x37, 0x32,
|
||||
0x66, 0x34, 0x64, 0x38, 0x30, 0x66, 0x31, 0x30,
|
||||
0x66, 0x36, 0x36, 0x33, 0x62, 0x35, 0x30, 0x34,
|
||||
0x39, 0x66, 0x37, 0x38, 0x39, 0x35, 0x34, 0x36,
|
||||
0x66, 0x32, 0x35, 0x66, 0x37, 0x30, 0x62, 0x62,
|
||||
0x36, 0x32, 0x61, 0x37, 0x66, 0x22, 0x3a, 0x7b,
|
||||
0x22, 0x62, 0x61, 0x6c, 0x61, 0x6e, 0x63, 0x65,
|
||||
0x22, 0x3a, 0x22, 0x30, 0x78, 0x33, 0x33, 0x62,
|
||||
0x32, 0x65, 0x33, 0x63, 0x39, 0x66, 0x64, 0x30,
|
||||
0x38, 0x30, 0x34, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x22, 0x7d, 0x7d, 0x2c,
|
||||
0x22, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22,
|
||||
0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
|
||||
0x67, 0x61, 0x73, 0x55, 0x73, 0x65, 0x64, 0x22,
|
||||
0x3a, 0x22, 0x30, 0x78, 0x30, 0x22, 0x2c, 0x22,
|
||||
0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x48, 0x61,
|
||||
0x73, 0x68, 0x22, 0x3a, 0x22, 0x30, 0x78, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30,
|
||||
0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x22,
|
||||
0x7d,
|
||||
},
|
||||
}
|
||||
DenaliConfig = Config{
|
||||
MintAddresses: []string{
|
||||
"95YUFjhDG892VePMzpwKF9JzewGKvGRi3",
|
||||
|
@ -393,6 +509,8 @@ var (
|
|||
// GetConfig ...
|
||||
func GetConfig(networkID uint32) *Config {
|
||||
switch networkID {
|
||||
case EverestID:
|
||||
return &EverestConfig
|
||||
case DenaliID:
|
||||
return &DenaliConfig
|
||||
case CascadeID:
|
||||
|
|
|
@ -23,8 +23,11 @@ func TestNetworkName(t *testing.T) {
|
|||
if name := NetworkName(DenaliID); name != DenaliName {
|
||||
t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, DenaliName)
|
||||
}
|
||||
if name := NetworkName(TestnetID); name != DenaliName {
|
||||
t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, DenaliName)
|
||||
if name := NetworkName(EverestID); name != EverestName {
|
||||
t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, EverestName)
|
||||
}
|
||||
if name := NetworkName(TestnetID); name != EverestName {
|
||||
t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, EverestName)
|
||||
}
|
||||
if name := NetworkName(4294967295); name != "network-4294967295" {
|
||||
t.Fatalf("NetworkID was incorrectly named. Result: %s ; Expected: %s", name, "network-4294967295")
|
||||
|
|
|
@ -16,13 +16,15 @@ var (
|
|||
MainnetID uint32 = 1
|
||||
CascadeID uint32 = 2
|
||||
DenaliID uint32 = 3
|
||||
EverestID uint32 = 4
|
||||
|
||||
TestnetID uint32 = 3
|
||||
TestnetID uint32 = 4
|
||||
LocalID uint32 = 12345
|
||||
|
||||
MainnetName = "mainnet"
|
||||
CascadeName = "cascade"
|
||||
DenaliName = "denali"
|
||||
EverestName = "everest"
|
||||
|
||||
TestnetName = "testnet"
|
||||
LocalName = "local"
|
||||
|
@ -31,6 +33,7 @@ var (
|
|||
MainnetID: MainnetName,
|
||||
CascadeID: CascadeName,
|
||||
DenaliID: DenaliName,
|
||||
EverestID: EverestName,
|
||||
|
||||
LocalID: LocalName,
|
||||
}
|
||||
|
@ -38,6 +41,7 @@ var (
|
|||
MainnetName: MainnetID,
|
||||
CascadeName: CascadeID,
|
||||
DenaliName: DenaliID,
|
||||
EverestName: EverestID,
|
||||
|
||||
TestnetName: TestnetID,
|
||||
LocalName: LocalID,
|
||||
|
|
17
ids/bag.go
17
ids/bag.go
|
@ -8,6 +8,10 @@ import (
|
|||
"strings"
|
||||
)
|
||||
|
||||
const (
|
||||
minBagSize = 16
|
||||
)
|
||||
|
||||
// Bag is a multiset of IDs.
|
||||
//
|
||||
// A bag has the ability to split and filter on it's bits for ease of use for
|
||||
|
@ -25,7 +29,7 @@ type Bag struct {
|
|||
|
||||
func (b *Bag) init() {
|
||||
if b.counts == nil {
|
||||
b.counts = make(map[[32]byte]int)
|
||||
b.counts = make(map[[32]byte]int, minBagSize)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -72,16 +76,21 @@ func (b *Bag) AddCount(id ID, count int) {
|
|||
}
|
||||
|
||||
// Count returns the number of times the id has been added.
|
||||
func (b *Bag) Count(id ID) int { return b.counts[*id.ID] }
|
||||
func (b *Bag) Count(id ID) int {
|
||||
b.init()
|
||||
return b.counts[*id.ID]
|
||||
}
|
||||
|
||||
// Len returns the number of times an id has been added.
|
||||
func (b *Bag) Len() int { return b.size }
|
||||
|
||||
// List returns a list of all ids that have been added.
|
||||
func (b *Bag) List() []ID {
|
||||
idList := []ID(nil)
|
||||
idList := make([]ID, len(b.counts), len(b.counts))
|
||||
i := 0
|
||||
for id := range b.counts {
|
||||
idList = append(idList, NewID(id))
|
||||
idList[i] = NewID(id)
|
||||
i++
|
||||
}
|
||||
return idList
|
||||
}
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
package ids
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"testing"
|
||||
)
|
||||
|
||||
//
|
||||
func BenchmarkBagListSmall(b *testing.B) {
|
||||
smallLen := 5
|
||||
bag := Bag{}
|
||||
for i := 0; i < smallLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
bag.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
for n := 0; n < b.N; n++ {
|
||||
bag.List()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkBagListMedium(b *testing.B) {
|
||||
mediumLen := 25
|
||||
bag := Bag{}
|
||||
for i := 0; i < mediumLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
bag.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
|
||||
for n := 0; n < b.N; n++ {
|
||||
bag.List()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkBagListLarge(b *testing.B) {
|
||||
largeLen := 100000
|
||||
bag := Bag{}
|
||||
for i := 0; i < largeLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
bag.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
for n := 0; n < b.N; n++ {
|
||||
bag.List()
|
||||
}
|
||||
}
|
|
@ -18,8 +18,8 @@ func TestBagAdd(t *testing.T) {
|
|||
} else if count := bag.Count(id1); count != 0 {
|
||||
t.Fatalf("Bag.Count returned %d expected %d", count, 0)
|
||||
} else if size := bag.Len(); size != 0 {
|
||||
t.Fatalf("Bag.Len returned %d expected %d", count, 0)
|
||||
} else if list := bag.List(); list != nil {
|
||||
t.Fatalf("Bag.Len returned %d elements expected %d", count, 0)
|
||||
} else if list := bag.List(); len(list) != 0 {
|
||||
t.Fatalf("Bag.List returned %v expected %v", list, nil)
|
||||
} else if mode, freq := bag.Mode(); !mode.IsZero() {
|
||||
t.Fatalf("Bag.Mode[0] returned %s expected %s", mode, ID{})
|
||||
|
|
14
ids/set.go
14
ids/set.go
|
@ -7,11 +7,19 @@ import (
|
|||
"strings"
|
||||
)
|
||||
|
||||
const (
|
||||
// The minimum capacity of a set
|
||||
minSetSize = 16
|
||||
)
|
||||
|
||||
// Set is a set of IDs
|
||||
type Set map[[32]byte]bool
|
||||
|
||||
func (ids *Set) init(size int) {
|
||||
if *ids == nil {
|
||||
if minSetSize > size {
|
||||
size = minSetSize
|
||||
}
|
||||
*ids = make(map[[32]byte]bool, size)
|
||||
}
|
||||
}
|
||||
|
@ -70,9 +78,11 @@ func (ids *Set) Clear() { *ids = nil }
|
|||
|
||||
// List converts this set into a list
|
||||
func (ids Set) List() []ID {
|
||||
idList := []ID(nil)
|
||||
idList := make([]ID, ids.Len(), ids.Len())
|
||||
i := 0
|
||||
for id := range ids {
|
||||
idList = append(idList, NewID(id))
|
||||
idList[i] = NewID(id)
|
||||
i++
|
||||
}
|
||||
return idList
|
||||
}
|
||||
|
|
|
@ -0,0 +1,53 @@
|
|||
package ids
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"testing"
|
||||
)
|
||||
|
||||
//
|
||||
func BenchmarkSetListSmall(b *testing.B) {
|
||||
smallLen := 5
|
||||
set := Set{}
|
||||
for i := 0; i < smallLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
set.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
for n := 0; n < b.N; n++ {
|
||||
set.List()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkSetListMedium(b *testing.B) {
|
||||
mediumLen := 25
|
||||
set := Set{}
|
||||
for i := 0; i < mediumLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
set.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
|
||||
for n := 0; n < b.N; n++ {
|
||||
set.List()
|
||||
}
|
||||
}
|
||||
|
||||
func BenchmarkSetListLarge(b *testing.B) {
|
||||
largeLen := 100000
|
||||
set := Set{}
|
||||
for i := 0; i < largeLen; i++ {
|
||||
var idBytes [32]byte
|
||||
rand.Read(idBytes[:])
|
||||
NewID(idBytes)
|
||||
set.Add(NewID(idBytes))
|
||||
}
|
||||
b.ResetTimer()
|
||||
for n := 0; n < b.N; n++ {
|
||||
set.List()
|
||||
}
|
||||
}
|
|
@ -5,11 +5,18 @@ package ids
|
|||
|
||||
import "strings"
|
||||
|
||||
const (
|
||||
minShortSetSize = 16
|
||||
)
|
||||
|
||||
// ShortSet is a set of ShortIDs
|
||||
type ShortSet map[[20]byte]bool
|
||||
|
||||
func (ids *ShortSet) init(size int) {
|
||||
if *ids == nil {
|
||||
if minShortSetSize > size {
|
||||
size = minShortSetSize
|
||||
}
|
||||
*ids = make(map[[20]byte]bool, size)
|
||||
}
|
||||
}
|
||||
|
@ -65,9 +72,11 @@ func (ids ShortSet) CappedList(size int) []ShortID {
|
|||
|
||||
// List converts this set into a list
|
||||
func (ids ShortSet) List() []ShortID {
|
||||
idList := make([]ShortID, len(ids))[:0]
|
||||
idList := make([]ShortID, len(ids), len(ids))
|
||||
i := 0
|
||||
for id := range ids {
|
||||
idList = append(idList, NewShortID(id))
|
||||
idList[i] = NewShortID(id)
|
||||
i++
|
||||
}
|
||||
return idList
|
||||
}
|
||||
|
|
|
@ -8,12 +8,16 @@ import (
|
|||
"strings"
|
||||
)
|
||||
|
||||
const (
|
||||
minUniqueBagSize = 16
|
||||
)
|
||||
|
||||
// UniqueBag ...
|
||||
type UniqueBag map[[32]byte]BitSet
|
||||
|
||||
func (b *UniqueBag) init() {
|
||||
if *b == nil {
|
||||
*b = make(map[[32]byte]BitSet)
|
||||
*b = make(map[[32]byte]BitSet, minUniqueBagSize)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
dbVersion = "v0.5.0"
|
||||
dbVersion = "v0.6.0"
|
||||
)
|
||||
|
||||
// Results of parsing the CLI
|
||||
|
|
|
@ -33,6 +33,12 @@ func (m Builder) PeerList(ipDescs []utils.IPDesc) (Msg, error) {
|
|||
return m.Pack(PeerList, map[Field]interface{}{Peers: ipDescs})
|
||||
}
|
||||
|
||||
// Ping message
|
||||
func (m Builder) Ping() (Msg, error) { return m.Pack(Ping, nil) }
|
||||
|
||||
// Pong message
|
||||
func (m Builder) Pong() (Msg, error) { return m.Pack(Pong, nil) }
|
||||
|
||||
// GetAcceptedFrontier message
|
||||
func (m Builder) GetAcceptedFrontier(chainID ids.ID, requestID uint32) (Msg, error) {
|
||||
return m.Pack(GetAcceptedFrontier, map[Field]interface{}{
|
||||
|
|
|
@ -132,6 +132,10 @@ func (op Op) String() string {
|
|||
return "get_peerlist"
|
||||
case PeerList:
|
||||
return "peerlist"
|
||||
case Ping:
|
||||
return "ping"
|
||||
case Pong:
|
||||
return "pong"
|
||||
case GetAcceptedFrontier:
|
||||
return "get_accepted_frontier"
|
||||
case AcceptedFrontier:
|
||||
|
@ -166,22 +170,21 @@ const (
|
|||
Version
|
||||
GetPeerList
|
||||
PeerList
|
||||
Ping
|
||||
Pong
|
||||
// Bootstrapping:
|
||||
GetAcceptedFrontier
|
||||
AcceptedFrontier
|
||||
GetAccepted
|
||||
Accepted
|
||||
GetAncestors
|
||||
MultiPut
|
||||
// Consensus:
|
||||
Get
|
||||
Put
|
||||
PushQuery
|
||||
PullQuery
|
||||
Chits
|
||||
// Bootstrapping:
|
||||
// TODO: Move GetAncestors and MultiPut with the rest of the bootstrapping
|
||||
// commands when we do non-backwards compatible upgrade
|
||||
GetAncestors
|
||||
MultiPut
|
||||
)
|
||||
|
||||
// Defines the messages that can be sent/received with this network
|
||||
|
@ -192,6 +195,8 @@ var (
|
|||
Version: {NetworkID, NodeID, MyTime, IP, VersionStr},
|
||||
GetPeerList: {},
|
||||
PeerList: {Peers},
|
||||
Ping: {},
|
||||
Pong: {},
|
||||
// Bootstrapping:
|
||||
GetAcceptedFrontier: {ChainID, RequestID},
|
||||
AcceptedFrontier: {ChainID, RequestID, ContainerIDs},
|
||||
|
|
|
@ -54,6 +54,7 @@ type metrics struct {
|
|||
|
||||
getVersion, version,
|
||||
getPeerlist, peerlist,
|
||||
ping, pong,
|
||||
getAcceptedFrontier, acceptedFrontier,
|
||||
getAccepted, accepted,
|
||||
get, getAncestors, put, multiPut,
|
||||
|
@ -78,6 +79,8 @@ func (m *metrics) initialize(registerer prometheus.Registerer) error {
|
|||
errs.Add(m.version.initialize(Version, registerer))
|
||||
errs.Add(m.getPeerlist.initialize(GetPeerList, registerer))
|
||||
errs.Add(m.peerlist.initialize(PeerList, registerer))
|
||||
errs.Add(m.ping.initialize(Ping, registerer))
|
||||
errs.Add(m.pong.initialize(Pong, registerer))
|
||||
errs.Add(m.getAcceptedFrontier.initialize(GetAcceptedFrontier, registerer))
|
||||
errs.Add(m.acceptedFrontier.initialize(AcceptedFrontier, registerer))
|
||||
errs.Add(m.getAccepted.initialize(GetAccepted, registerer))
|
||||
|
@ -103,6 +106,10 @@ func (m *metrics) message(msgType Op) *messageMetrics {
|
|||
return &m.getPeerlist
|
||||
case PeerList:
|
||||
return &m.peerlist
|
||||
case Ping:
|
||||
return &m.ping
|
||||
case Pong:
|
||||
return &m.pong
|
||||
case GetAcceptedFrontier:
|
||||
return &m.getAcceptedFrontier
|
||||
case AcceptedFrontier:
|
||||
|
|
|
@ -43,6 +43,12 @@ const (
|
|||
defaultGetVersionTimeout = 2 * time.Second
|
||||
defaultAllowPrivateIPs = true
|
||||
defaultGossipSize = 50
|
||||
defaultPingPongTimeout = time.Minute
|
||||
defaultPingFrequency = 3 * defaultPingPongTimeout / 4
|
||||
|
||||
// Request ID used when sending a Put message to gossip an accepted container
|
||||
// (ie not sent in response to a Get)
|
||||
GossipMsgRequestID = math.MaxUint32
|
||||
)
|
||||
|
||||
// Network defines the functionality of the networking library.
|
||||
|
@ -119,6 +125,8 @@ type network struct {
|
|||
getVersionTimeout time.Duration
|
||||
allowPrivateIPs bool
|
||||
gossipSize int
|
||||
pingPongTimeout time.Duration
|
||||
pingFrequency time.Duration
|
||||
|
||||
executor timer.Executor
|
||||
|
||||
|
@ -180,6 +188,8 @@ func NewDefaultNetwork(
|
|||
defaultGetVersionTimeout,
|
||||
defaultAllowPrivateIPs,
|
||||
defaultGossipSize,
|
||||
defaultPingPongTimeout,
|
||||
defaultPingFrequency,
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -211,6 +221,8 @@ func NewNetwork(
|
|||
getVersionTimeout time.Duration,
|
||||
allowPrivateIPs bool,
|
||||
gossipSize int,
|
||||
pingPongTimeout time.Duration,
|
||||
pingFrequency time.Duration,
|
||||
) Network {
|
||||
net := &network{
|
||||
log: log,
|
||||
|
@ -239,6 +251,8 @@ func NewNetwork(
|
|||
getVersionTimeout: getVersionTimeout,
|
||||
allowPrivateIPs: allowPrivateIPs,
|
||||
gossipSize: gossipSize,
|
||||
pingPongTimeout: pingPongTimeout,
|
||||
pingFrequency: pingFrequency,
|
||||
|
||||
disconnectedIPs: make(map[string]struct{}),
|
||||
connectedIPs: make(map[string]struct{}),
|
||||
|
@ -705,7 +719,7 @@ func (n *network) Track(ip utils.IPDesc) {
|
|||
|
||||
// assumes the stateLock is not held.
|
||||
func (n *network) gossipContainer(chainID, containerID ids.ID, container []byte) error {
|
||||
msg, err := n.b.Put(chainID, math.MaxUint32, containerID, container)
|
||||
msg, err := n.b.Put(chainID, GossipMsgRequestID, containerID, container)
|
||||
if err != nil {
|
||||
return fmt.Errorf("attempted to pack too large of a Put message.\nContainer length: %d", len(container))
|
||||
}
|
||||
|
|
|
@ -64,6 +64,24 @@ func (p *peer) Start() {
|
|||
// Initially send the version to the peer
|
||||
go p.Version()
|
||||
go p.requestVersion()
|
||||
go p.sendPings()
|
||||
}
|
||||
|
||||
func (p *peer) sendPings() {
|
||||
t := time.NewTicker(p.net.pingFrequency)
|
||||
defer t.Stop()
|
||||
|
||||
for range t.C {
|
||||
p.net.stateLock.Lock()
|
||||
closed := p.closed
|
||||
p.net.stateLock.Unlock()
|
||||
|
||||
if closed {
|
||||
return
|
||||
}
|
||||
|
||||
p.Ping()
|
||||
}
|
||||
}
|
||||
|
||||
// request the version from the peer until we get the version from them
|
||||
|
@ -80,6 +98,7 @@ func (p *peer) requestVersion() {
|
|||
if connected || closed {
|
||||
return
|
||||
}
|
||||
|
||||
p.GetVersion()
|
||||
}
|
||||
}
|
||||
|
@ -88,6 +107,11 @@ func (p *peer) requestVersion() {
|
|||
func (p *peer) ReadMessages() {
|
||||
defer p.Close()
|
||||
|
||||
if err := p.conn.SetReadDeadline(p.net.clock.Time().Add(p.net.pingPongTimeout)); err != nil {
|
||||
p.net.log.Verbo("error on setting the connection read timeout %s", err)
|
||||
return
|
||||
}
|
||||
|
||||
pendingBuffer := wrappers.Packer{}
|
||||
readBuffer := make([]byte, 1<<10)
|
||||
for {
|
||||
|
@ -218,7 +242,15 @@ func (p *peer) send(msg Msg) bool {
|
|||
// assumes the stateLock is not held
|
||||
func (p *peer) handle(msg Msg) {
|
||||
p.net.heartbeat()
|
||||
atomic.StoreInt64(&p.lastReceived, p.net.clock.Time().Unix())
|
||||
|
||||
currentTime := p.net.clock.Time()
|
||||
atomic.StoreInt64(&p.lastReceived, currentTime.Unix())
|
||||
|
||||
if err := p.conn.SetReadDeadline(currentTime.Add(p.net.pingPongTimeout)); err != nil {
|
||||
p.net.log.Verbo("error on setting the connection read timeout %s, closing the connection", err)
|
||||
p.Close()
|
||||
return
|
||||
}
|
||||
|
||||
op := msg.Op()
|
||||
msgMetrics := p.net.message(op)
|
||||
|
@ -235,6 +267,12 @@ func (p *peer) handle(msg Msg) {
|
|||
case GetVersion:
|
||||
p.getVersion(msg)
|
||||
return
|
||||
case Ping:
|
||||
p.ping(msg)
|
||||
return
|
||||
case Pong:
|
||||
p.pong(msg)
|
||||
return
|
||||
}
|
||||
if !p.connected {
|
||||
p.net.log.Debug("dropping message from %s because the connection hasn't been established yet", p.id)
|
||||
|
@ -318,6 +356,12 @@ func (p *peer) GetPeerList() {
|
|||
p.Send(msg)
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) SendPeerList() {
|
||||
ips := p.net.validatorIPs()
|
||||
p.PeerList(ips)
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) PeerList(peers []utils.IPDesc) {
|
||||
msg, err := p.net.b.PeerList(peers)
|
||||
|
@ -326,7 +370,28 @@ func (p *peer) PeerList(peers []utils.IPDesc) {
|
|||
return
|
||||
}
|
||||
p.Send(msg)
|
||||
return
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) Ping() {
|
||||
msg, err := p.net.b.Ping()
|
||||
p.net.log.AssertNoError(err)
|
||||
if p.Send(msg) {
|
||||
p.net.ping.numSent.Inc()
|
||||
} else {
|
||||
p.net.ping.numFailed.Inc()
|
||||
}
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) Pong() {
|
||||
msg, err := p.net.b.Pong()
|
||||
p.net.log.AssertNoError(err)
|
||||
if p.Send(msg) {
|
||||
p.net.pong.numSent.Inc()
|
||||
} else {
|
||||
p.net.pong.numFailed.Inc()
|
||||
}
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
|
@ -458,17 +523,6 @@ func (p *peer) version(msg Msg) {
|
|||
p.net.connected(p)
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) SendPeerList() {
|
||||
ips := p.net.validatorIPs()
|
||||
reply, err := p.net.b.PeerList(ips)
|
||||
if err != nil {
|
||||
p.net.log.Warn("failed to send PeerList message due to %s", err)
|
||||
return
|
||||
}
|
||||
p.Send(reply)
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) getPeerList(_ Msg) { p.SendPeerList() }
|
||||
|
||||
|
@ -488,6 +542,12 @@ func (p *peer) peerList(msg Msg) {
|
|||
p.net.stateLock.Unlock()
|
||||
}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) ping(_ Msg) { p.Pong() }
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) pong(_ Msg) {}
|
||||
|
||||
// assumes the stateLock is not held
|
||||
func (p *peer) getAcceptedFrontier(msg Msg) {
|
||||
chainID, err := ids.ToID(msg.Get(ChainID).([]byte))
|
||||
|
|
|
@ -56,7 +56,7 @@ var (
|
|||
genesisHashKey = []byte("genesisID")
|
||||
|
||||
// Version is the version of this code
|
||||
Version = version.NewDefaultVersion("avalanche", 0, 5, 5)
|
||||
Version = version.NewDefaultVersion("avalanche", 0, 6, 0)
|
||||
versionParser = version.NewDefaultParser()
|
||||
)
|
||||
|
||||
|
|
|
@ -32,9 +32,19 @@ import (
|
|||
type polls struct {
|
||||
log logging.Logger
|
||||
numPolls prometheus.Gauge
|
||||
alpha int
|
||||
m map[uint32]poll
|
||||
}
|
||||
|
||||
func newPolls(alpha int, log logging.Logger, numPolls prometheus.Gauge) polls {
|
||||
return polls{
|
||||
log: log,
|
||||
numPolls: numPolls,
|
||||
alpha: alpha,
|
||||
m: make(map[uint32]poll),
|
||||
}
|
||||
}
|
||||
|
||||
// Add to the current set of polls
|
||||
// Returns true if the poll was registered correctly and the network sample
|
||||
// should be made.
|
||||
|
@ -42,6 +52,7 @@ func (p *polls) Add(requestID uint32, vdrs ids.ShortSet) bool {
|
|||
poll, exists := p.m[requestID]
|
||||
if !exists {
|
||||
poll.polled = vdrs
|
||||
poll.alpha = p.alpha
|
||||
p.m[requestID] = poll
|
||||
|
||||
p.numPolls.Set(float64(len(p.m))) // Tracks performance statistics
|
||||
|
@ -85,6 +96,7 @@ func (p *polls) String() string {
|
|||
type poll struct {
|
||||
votes ids.UniqueBag
|
||||
polled ids.ShortSet
|
||||
alpha int
|
||||
}
|
||||
|
||||
// Vote registers a vote for this poll
|
||||
|
@ -97,5 +109,29 @@ func (p *poll) Vote(votes []ids.ID, vdr ids.ShortID) {
|
|||
|
||||
// Finished returns true if the poll has completed, with no more required
|
||||
// responses
|
||||
func (p poll) Finished() bool { return p.polled.Len() == 0 }
|
||||
func (p poll) Finished() bool {
|
||||
// If there are no outstanding queries, the poll is finished
|
||||
numPending := p.polled.Len()
|
||||
if numPending == 0 {
|
||||
return true
|
||||
}
|
||||
// If there are still enough pending responses to include another vertex,
|
||||
// then the poll must wait for more responses
|
||||
if numPending > p.alpha {
|
||||
return false
|
||||
}
|
||||
|
||||
// Ignore any vertex that has already received alpha votes. To safely skip
|
||||
// DAG traversal, assume that all votes for vertices with less than alpha
|
||||
// votes will be applied to a single shared ancestor. In this case, the poll
|
||||
// can terminate early, iff there are not enough pending votes for this
|
||||
// ancestor to receive alpha votes.
|
||||
partialVotes := ids.BitSet(0)
|
||||
for _, vote := range p.votes.List() {
|
||||
if voters := p.votes.GetSet(vote); voters.Len() < p.alpha {
|
||||
partialVotes.Union(voters)
|
||||
}
|
||||
}
|
||||
return partialVotes.Len()+numPending < p.alpha
|
||||
}
|
||||
func (p poll) String() string { return fmt.Sprintf("Waiting on %d chits", p.polled.Len()) }
|
||||
|
|
|
@ -0,0 +1,99 @@
|
|||
package avalanche
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/ava-labs/gecko/ids"
|
||||
)
|
||||
|
||||
func TestPollTerminatesEarlyVirtuousCase(t *testing.T) {
|
||||
alpha := 3
|
||||
|
||||
vtxID := GenerateID()
|
||||
votes := []ids.ID{vtxID}
|
||||
|
||||
vdr1 := ids.NewShortID([20]byte{1})
|
||||
vdr2 := ids.NewShortID([20]byte{2})
|
||||
vdr3 := ids.NewShortID([20]byte{3})
|
||||
vdr4 := ids.NewShortID([20]byte{4})
|
||||
vdr5 := ids.NewShortID([20]byte{5}) // k = 5
|
||||
|
||||
vdrs := ids.ShortSet{}
|
||||
vdrs.Add(vdr1)
|
||||
vdrs.Add(vdr2)
|
||||
vdrs.Add(vdr3)
|
||||
vdrs.Add(vdr4)
|
||||
vdrs.Add(vdr5)
|
||||
|
||||
poll := poll{
|
||||
votes: make(ids.UniqueBag),
|
||||
polled: vdrs,
|
||||
alpha: alpha,
|
||||
}
|
||||
|
||||
poll.Vote(votes, vdr1)
|
||||
if poll.Finished() {
|
||||
t.Fatalf("Poll finished after less than alpha votes")
|
||||
}
|
||||
poll.Vote(votes, vdr2)
|
||||
if poll.Finished() {
|
||||
t.Fatalf("Poll finished after less than alpha votes")
|
||||
}
|
||||
poll.Vote(votes, vdr3)
|
||||
if !poll.Finished() {
|
||||
t.Fatalf("Poll did not terminate early after receiving alpha votes for one vertex and none for other vertices")
|
||||
}
|
||||
}
|
||||
|
||||
func TestPollAccountsForSharedAncestor(t *testing.T) {
|
||||
alpha := 4
|
||||
|
||||
vtxA := GenerateID()
|
||||
vtxB := GenerateID()
|
||||
vtxC := GenerateID()
|
||||
vtxD := GenerateID()
|
||||
|
||||
// If validators 1-3 vote for frontier vertices
|
||||
// B, C, and D respectively, which all share the common ancestor
|
||||
// A, then we cannot terminate early with alpha = k = 4
|
||||
// If the final vote is cast for any of A, B, C, or D, then
|
||||
// vertex A will have transitively received alpha = 4 votes
|
||||
vdr1 := ids.NewShortID([20]byte{1})
|
||||
vdr2 := ids.NewShortID([20]byte{2})
|
||||
vdr3 := ids.NewShortID([20]byte{3})
|
||||
vdr4 := ids.NewShortID([20]byte{4})
|
||||
|
||||
vdrs := ids.ShortSet{}
|
||||
vdrs.Add(vdr1)
|
||||
vdrs.Add(vdr2)
|
||||
vdrs.Add(vdr3)
|
||||
vdrs.Add(vdr4)
|
||||
|
||||
poll := poll{
|
||||
votes: make(ids.UniqueBag),
|
||||
polled: vdrs,
|
||||
alpha: alpha,
|
||||
}
|
||||
|
||||
votes1 := []ids.ID{vtxB}
|
||||
poll.Vote(votes1, vdr1)
|
||||
if poll.Finished() {
|
||||
t.Fatalf("Poll finished early after receiving one vote")
|
||||
}
|
||||
votes2 := []ids.ID{vtxC}
|
||||
poll.Vote(votes2, vdr2)
|
||||
if poll.Finished() {
|
||||
t.Fatalf("Poll finished early after receiving two votes")
|
||||
}
|
||||
votes3 := []ids.ID{vtxD}
|
||||
poll.Vote(votes3, vdr3)
|
||||
if poll.Finished() {
|
||||
t.Fatalf("Poll terminated early, when a shared ancestor could have received alpha votes")
|
||||
}
|
||||
|
||||
votes4 := []ids.ID{vtxA}
|
||||
poll.Vote(votes4, vdr4)
|
||||
if !poll.Finished() {
|
||||
t.Fatalf("Poll did not terminate after receiving all outstanding votes")
|
||||
}
|
||||
}
|
|
@ -57,9 +57,7 @@ func (t *Transitive) Initialize(config Config) error {
|
|||
|
||||
t.onFinished = t.finishBootstrapping
|
||||
|
||||
t.polls.log = config.Context.Log
|
||||
t.polls.numPolls = t.numPolls
|
||||
t.polls.m = make(map[uint32]poll)
|
||||
t.polls = newPolls(int(config.Alpha), config.Context.Log, t.numPolls)
|
||||
|
||||
return t.bootstrapper.Initialize(config.BootstrapConfig)
|
||||
}
|
||||
|
@ -169,7 +167,11 @@ func (t *Transitive) Put(vdr ids.ShortID, requestID uint32, vtxID ids.ID, vtxByt
|
|||
t.Config.Context.Log.Verbo("Put(%s, %d, %s) called", vdr, requestID, vtxID)
|
||||
|
||||
if !t.bootstrapped { // Bootstrapping unfinished --> didn't call Get --> this message is invalid
|
||||
t.Config.Context.Log.Debug("dropping Put(%s, %d, %s) due to bootstrapping", vdr, requestID, vtxID)
|
||||
if requestID == network.GossipMsgRequestID {
|
||||
t.Config.Context.Log.Verbo("dropping gossip Put(%s, %d, %s) due to bootstrapping", vdr, requestID, vtxID)
|
||||
} else {
|
||||
t.Config.Context.Log.Debug("dropping Put(%s, %d, %s) due to bootstrapping", vdr, requestID, vtxID)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -7,6 +7,10 @@ import (
|
|||
"github.com/ava-labs/gecko/ids"
|
||||
)
|
||||
|
||||
const (
|
||||
minRequestsSize = 32
|
||||
)
|
||||
|
||||
type req struct {
|
||||
vdr ids.ShortID
|
||||
id uint32
|
||||
|
@ -22,7 +26,7 @@ type Requests struct {
|
|||
// are only in one request at a time.
|
||||
func (r *Requests) Add(vdr ids.ShortID, requestID uint32, containerID ids.ID) {
|
||||
if r.reqsToID == nil {
|
||||
r.reqsToID = make(map[[20]byte]map[uint32]ids.ID)
|
||||
r.reqsToID = make(map[[20]byte]map[uint32]ids.ID, minRequestsSize)
|
||||
}
|
||||
vdrKey := vdr.Key()
|
||||
vdrReqs, ok := r.reqsToID[vdrKey]
|
||||
|
@ -33,7 +37,7 @@ func (r *Requests) Add(vdr ids.ShortID, requestID uint32, containerID ids.ID) {
|
|||
vdrReqs[requestID] = containerID
|
||||
|
||||
if r.idToReq == nil {
|
||||
r.idToReq = make(map[[32]byte]req)
|
||||
r.idToReq = make(map[[32]byte]req, minRequestsSize)
|
||||
}
|
||||
r.idToReq[containerID.Key()] = req{
|
||||
vdr: vdr,
|
||||
|
|
|
@ -185,7 +185,11 @@ func (t *Transitive) GetAncestors(vdr ids.ShortID, requestID uint32, blkID ids.I
|
|||
func (t *Transitive) Put(vdr ids.ShortID, requestID uint32, blkID ids.ID, blkBytes []byte) error {
|
||||
// bootstrapping isn't done --> we didn't send any gets --> this put is invalid
|
||||
if !t.bootstrapped {
|
||||
t.Config.Context.Log.Debug("dropping Put(%s, %d, %s) due to bootstrapping", vdr, requestID, blkID)
|
||||
if requestID == network.GossipMsgRequestID {
|
||||
t.Config.Context.Log.Verbo("dropping gossip Put(%s, %d, %s) due to bootstrapping", vdr, requestID, blkID)
|
||||
} else {
|
||||
t.Config.Context.Log.Debug("dropping Put(%s, %d, %s) due to bootstrapping", vdr, requestID, blkID)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -10,12 +10,16 @@ import (
|
|||
"github.com/ava-labs/gecko/ids"
|
||||
)
|
||||
|
||||
const (
|
||||
minBlockerSize = 16
|
||||
)
|
||||
|
||||
// Blocker tracks objects that are blocked
|
||||
type Blocker map[[32]byte][]Blockable
|
||||
|
||||
func (b *Blocker) init() {
|
||||
if *b == nil {
|
||||
*b = make(map[[32]byte][]Blockable)
|
||||
*b = make(map[[32]byte][]Blockable, minBlockerSize)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue