TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: remove AddressVersion from the configuration

Browse source 
It is never used and is the same constant for both mainnet, testnet and
privnet.
This commit is contained in:
Evgenii Stratonikov 2020-06-17 15:53:20 +03:00
parent b3b1137030
commit 651976b2ca
12 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/server/server.go
View file

@ -10,7 +10,6 @@ import (
"github.com/nspcc-dev/neo-go/pkg/core"
"github.com/nspcc-dev/neo-go/pkg/core/block"
"github.com/nspcc-dev/neo-go/pkg/core/storage"
"github.com/nspcc-dev/neo-go/pkg/encoding/address"
"github.com/nspcc-dev/neo-go/pkg/io"
"github.com/nspcc-dev/neo-go/pkg/network"
"github.com/nspcc-dev/neo-go/pkg/network/metrics"
@ -424,9 +423,6 @@ func initBlockChain(cfg config.Config, log *zap.Logger) (*core.Blockchain, error
if err != nil {
return nil, cli.NewExitError(fmt.Errorf("could not initialize blockchain: %s", err), 1)
}
if cfg.ProtocolConfiguration.AddressVersion != 0 {
address.Prefix = cfg.ProtocolConfiguration.AddressVersion
}
return chain, nil
}

1
config/protocol.mainnet.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 5195086
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.001
MemPoolSize: 50000

1
config/protocol.privnet.docker.four.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.privnet.docker.one.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.privnet.docker.single.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 1
LowPriorityThreshold: 0.001
MemPoolSize: 50000

1
config/protocol.privnet.docker.three.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.privnet.docker.two.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.privnet.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.testnet.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 1951352142
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
config/protocol.unit_testnet.yml
View file

@ -1,6 +1,5 @@
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
SecondsPerBlock: 15
LowPriorityThreshold: 0.000
MemPoolSize: 50000

1
docs/cli.md
View file

@ -48,7 +48,6 @@ Example of such configuration:
```yaml
ProtocolConfiguration:
Magic: 56753
AddressVersion: 23
StandbyValidators:
- 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2
- 02103a7f7dd016558597f7960d27c516a4394fd968b9e65155eb4b013e4040406e

1
pkg/config/protocol_config.go
View file

@ -18,7 +18,6 @@ const (
// ProtocolConfiguration represents the protocol config.
type (
ProtocolConfiguration struct {
AddressVersion byte `yaml:"AddressVersion"`
// FeePerExtraByte sets the expected per-byte fee for
// transactions exceeding the MaxFreeTransactionSize.
FeePerExtraByte float64 `yaml:"FeePerExtraByte"`