Skip to content

Commit

Permalink
Merge branch 'dev' into MerkleDBVariableRenaming
Browse files Browse the repository at this point in the history
  • Loading branch information
dboehm-avalabs authored Oct 19, 2023
2 parents ce88bf6 + 927c23d commit 348f0db
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
8 changes: 7 additions & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,18 @@ const (
chainUpgradeFileName = "upgrade"
subnetConfigFileExt = ".json"
ipResolutionTimeout = 30 * time.Second

ipcDeprecationMsg = "IPC API is deprecated"
)

var (
// Deprecated key --> deprecation message (i.e. which key replaces it)
// TODO: deprecate "BootstrapIDsKey" and "BootstrapIPsKey"
deprecatedKeys = map[string]string{}
deprecatedKeys = map[string]string{
IpcAPIEnabledKey: ipcDeprecationMsg,
IpcsChainIDsKey: ipcDeprecationMsg,
IpcsPathKey: ipcDeprecationMsg,
}

errSybilProtectionDisabledStakerWeights = errors.New("sybil protection disabled weights must be positive")
errSybilProtectionDisabledOnPublicNetwork = errors.New("sybil protection disabled on public network")
Expand Down
2 changes: 1 addition & 1 deletion scripts/constants.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fi
#
# We use "export" here instead of just setting a bash variable because we need
# to pass this flag to all child processes spawned by the shell.
export CGO_CFLAGS="-O -D__BLST_PORTABLE__"
export CGO_CFLAGS="-O2 -D__BLST_PORTABLE__"
# While CGO_ENABLED doesn't need to be explicitly set, it produces a much more
# clear error due to the default value change in go1.20.
export CGO_ENABLED=1
2 changes: 2 additions & 0 deletions scripts/mock.gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ then
go install -v github.com/palantir/[email protected]
fi

source ./scripts/constants.sh

# tuples of (source interface import path, comma-separated interface names, output file path)
input="scripts/mocks.mockgen.txt"
while IFS= read -r line
Expand Down

0 comments on commit 348f0db

Please sign in to comment.