diff --git a/vms/avm/config_test.go b/vms/avm/config_test.go index 5bfb7a85c00..5d4f6d476c4 100644 --- a/vms/avm/config_test.go +++ b/vms/avm/config_test.go @@ -41,7 +41,6 @@ func TestParseConfig(t *testing.T) { MaxValidatorSetStaleness: time.Nanosecond, TargetGossipSize: network.DefaultConfig.TargetGossipSize, PushGossipNumValidators: network.DefaultConfig.PushGossipNumValidators, - PushGossipNumNonValidators: network.DefaultConfig.PushGossipNumNonValidators, PushGossipNumPeers: network.DefaultConfig.PushGossipNumPeers, PushGossipDiscardedCacheSize: network.DefaultConfig.PushGossipDiscardedCacheSize, PushGossipMaxRegossipFrequency: network.DefaultConfig.PushGossipMaxRegossipFrequency, diff --git a/vms/avm/network/config.go b/vms/avm/network/config.go index 594ed8e1668..d545d1ee8e8 100644 --- a/vms/avm/network/config.go +++ b/vms/avm/network/config.go @@ -13,7 +13,6 @@ var DefaultConfig = Config{ MaxValidatorSetStaleness: time.Minute, TargetGossipSize: 20 * units.KiB, PushGossipNumValidators: 10, - PushGossipNumNonValidators: 0, PushGossipNumPeers: 0, PushGossipDiscardedCacheSize: 1024, PushGossipMaxRegossipFrequency: 10 * time.Second, @@ -38,9 +37,6 @@ type Config struct { // PushGossipNumValidators is the number of validators to push transactions // to per round of gossip. PushGossipNumValidators int `json:"push-gossip-num-validators"` - // PushGossipNumNonValidators is the number of non-validators to push - // transactions to per round of gossip. - PushGossipNumNonValidators int `json:"push-gossip-num-non-validators"` // PushGossipNumPeers is the number of peers to push transactions to per // round of gossip. PushGossipNumPeers int `json:"push-gossip-num-peers"` diff --git a/vms/avm/network/network.go b/vms/avm/network/network.go index 1af12d729e4..ae594d9a6b4 100644 --- a/vms/avm/network/network.go +++ b/vms/avm/network/network.go @@ -21,7 +21,10 @@ import ( "github.com/ava-labs/avalanchego/vms/components/message" ) -const txGossipHandlerID = 0 +const ( + txGossipHandlerID = 0 + pushGossipNumNonValidators = 0 +) var ( _ common.AppHandler = (*Network)(nil) @@ -95,7 +98,7 @@ func New( txGossipClient, txGossipMetrics, config.PushGossipNumValidators, - config.PushGossipNumNonValidators, + pushGossipNumNonValidators, config.PushGossipNumPeers, config.PushGossipDiscardedCacheSize, config.TargetGossipSize, diff --git a/vms/avm/network/network_test.go b/vms/avm/network/network_test.go index 7b57eb2c41a..39e58039229 100644 --- a/vms/avm/network/network_test.go +++ b/vms/avm/network/network_test.go @@ -33,7 +33,6 @@ var ( MaxValidatorSetStaleness: time.Second, TargetGossipSize: 1, PushGossipNumValidators: 1, - PushGossipNumNonValidators: 0, PushGossipNumPeers: 0, PushGossipDiscardedCacheSize: 1, PushGossipMaxRegossipFrequency: time.Second, diff --git a/vms/platformvm/config/execution_config_test.go b/vms/platformvm/config/execution_config_test.go index 3a25990e741..e096fd7ac74 100644 --- a/vms/platformvm/config/execution_config_test.go +++ b/vms/platformvm/config/execution_config_test.go @@ -46,18 +46,17 @@ func TestExecutionConfigUnmarshal(t *testing.T) { "max-validator-set-staleness": 1, "target-gossip-size": 2, "push-gossip-num-validators": 3, - "push-gossip-num-non-validators": 4, - "push-gossip-num-peers": 5, - "push-gossip-discarded-cache-size": 6, - "push-gossip-max-regossip-frequency": 7, - "push-gossip-frequency": 8, - "pull-gossip-poll-size": 9, - "pull-gossip-frequency": 10, - "pull-gossip-throttling-period": 11, - "pull-gossip-throttling-limit": 12, - "expected-bloom-filter-elements": 13, - "expected-bloom-filter-false-positive-probability": 14, - "max-bloom-filter-false-positive-probability": 15 + "push-gossip-num-peers": 4, + "push-gossip-discarded-cache-size": 5, + "push-gossip-max-regossip-frequency": 6, + "push-gossip-frequency": 7, + "pull-gossip-poll-size": 8, + "pull-gossip-frequency": 9, + "pull-gossip-throttling-period": 10, + "pull-gossip-throttling-limit": 11, + "expected-bloom-filter-elements": 12, + "expected-bloom-filter-false-positive-probability": 13, + "max-bloom-filter-false-positive-probability": 14 }, "block-cache-size": 1, "tx-cache-size": 2, @@ -77,18 +76,17 @@ func TestExecutionConfigUnmarshal(t *testing.T) { MaxValidatorSetStaleness: 1, TargetGossipSize: 2, PushGossipNumValidators: 3, - PushGossipNumNonValidators: 4, - PushGossipNumPeers: 5, - PushGossipDiscardedCacheSize: 6, - PushGossipMaxRegossipFrequency: 7, - PushGossipFrequency: 8, - PullGossipPollSize: 9, - PullGossipFrequency: 10, - PullGossipThrottlingPeriod: 11, - PullGossipThrottlingLimit: 12, - ExpectedBloomFilterElements: 13, - ExpectedBloomFilterFalsePositiveProbability: 14, - MaxBloomFilterFalsePositiveProbability: 15, + PushGossipNumPeers: 4, + PushGossipDiscardedCacheSize: 5, + PushGossipMaxRegossipFrequency: 6, + PushGossipFrequency: 7, + PullGossipPollSize: 8, + PullGossipFrequency: 9, + PullGossipThrottlingPeriod: 10, + PullGossipThrottlingLimit: 11, + ExpectedBloomFilterElements: 12, + ExpectedBloomFilterFalsePositiveProbability: 13, + MaxBloomFilterFalsePositiveProbability: 14, }, BlockCacheSize: 1, TxCacheSize: 2, @@ -133,7 +131,6 @@ func TestExecutionConfigUnmarshal(t *testing.T) { MaxValidatorSetStaleness: 1, TargetGossipSize: 2, PushGossipNumValidators: DefaultExecutionConfig.Network.PushGossipNumValidators, - PushGossipNumNonValidators: DefaultExecutionConfig.Network.PushGossipNumNonValidators, PushGossipNumPeers: DefaultExecutionConfig.Network.PushGossipNumPeers, PushGossipDiscardedCacheSize: DefaultExecutionConfig.Network.PushGossipDiscardedCacheSize, PushGossipMaxRegossipFrequency: DefaultExecutionConfig.Network.PushGossipMaxRegossipFrequency, diff --git a/vms/platformvm/network/config.go b/vms/platformvm/network/config.go index 594ed8e1668..d545d1ee8e8 100644 --- a/vms/platformvm/network/config.go +++ b/vms/platformvm/network/config.go @@ -13,7 +13,6 @@ var DefaultConfig = Config{ MaxValidatorSetStaleness: time.Minute, TargetGossipSize: 20 * units.KiB, PushGossipNumValidators: 10, - PushGossipNumNonValidators: 0, PushGossipNumPeers: 0, PushGossipDiscardedCacheSize: 1024, PushGossipMaxRegossipFrequency: 10 * time.Second, @@ -38,9 +37,6 @@ type Config struct { // PushGossipNumValidators is the number of validators to push transactions // to per round of gossip. PushGossipNumValidators int `json:"push-gossip-num-validators"` - // PushGossipNumNonValidators is the number of non-validators to push - // transactions to per round of gossip. - PushGossipNumNonValidators int `json:"push-gossip-num-non-validators"` // PushGossipNumPeers is the number of peers to push transactions to per // round of gossip. PushGossipNumPeers int `json:"push-gossip-num-peers"` diff --git a/vms/platformvm/network/network.go b/vms/platformvm/network/network.go index ded9b3aa377..24a09e48b0e 100644 --- a/vms/platformvm/network/network.go +++ b/vms/platformvm/network/network.go @@ -22,7 +22,10 @@ import ( "github.com/ava-labs/avalanchego/vms/platformvm/txs/mempool" ) -const TxGossipHandlerID = 0 +const ( + TxGossipHandlerID = 0 + pushGossipNumNonValidators = 0 +) var errMempoolDisabledWithPartialSync = errors.New("mempool is disabled partial syncing") @@ -94,7 +97,7 @@ func New( txGossipClient, txGossipMetrics, config.PushGossipNumValidators, - config.PushGossipNumNonValidators, + pushGossipNumNonValidators, config.PushGossipNumPeers, config.PushGossipDiscardedCacheSize, config.TargetGossipSize, diff --git a/vms/platformvm/network/network_test.go b/vms/platformvm/network/network_test.go index f119195937e..8572c97100d 100644 --- a/vms/platformvm/network/network_test.go +++ b/vms/platformvm/network/network_test.go @@ -30,7 +30,6 @@ var ( MaxValidatorSetStaleness: time.Second, TargetGossipSize: 1, PushGossipNumValidators: 1, - PushGossipNumNonValidators: 0, PushGossipNumPeers: 0, PushGossipDiscardedCacheSize: 1, PushGossipMaxRegossipFrequency: time.Second,