From 9a85bea3351541321178c5e7f1f86e206b1024f7 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@monax.io>
Date: Tue, 28 Feb 2017 17:49:05 +0100
Subject: [PATCH] version: update develop to start work for v0.17
---
config/config.go | 4 ++--
config/templates.go | 2 +-
core/config.go | 2 +-
manager/eris-mint/version.go | 2 +-
rpc/tendermint/test/config.go | 6 +++---
version/version.go | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/config/config.go b/config/config.go
index e49db3d1..97141bd4 100644
--- a/config/config.go
+++ b/config/config.go
@@ -90,7 +90,7 @@ func GetConfigurationFileBytes(chainId, moniker, seeds string, chainImageName st
erisdbChain := &ConfigChainGeneral{
AssertChainId: chainId,
ErisdbMajorVersion: uint8(0),
- ErisdbMinorVersion: uint8(16),
+ ErisdbMinorVersion: uint8(17),
GenesisRelativePath: "genesis.json",
}
chainConsensusModule := &ConfigChainModule{
@@ -102,7 +102,7 @@ func GetConfigurationFileBytes(chainId, moniker, seeds string, chainImageName st
chainApplicationManagerModule := &ConfigChainModule{
Name: "erismint",
MajorVersion: uint8(0),
- MinorVersion: uint8(16),
+ MinorVersion: uint8(17),
ModuleRelativeRoot: "erismint",
}
tendermintModule := &ConfigTendermint{
diff --git a/config/templates.go b/config/templates.go
index 27372813..433d8c8a 100644
--- a/config/templates.go
+++ b/config/templates.go
@@ -280,7 +280,7 @@ const sectionErisMint = `
################################################################################
##
## Eris-Mint
-## version 0.16
+## version 0.17
##
## The original Ethereum virtual machine with IAVL merkle trees
## and tendermint/go-wire encoding
diff --git a/core/config.go b/core/config.go
index 9090c28a..eb481395 100644
--- a/core/config.go
+++ b/core/config.go
@@ -59,7 +59,7 @@ func LoadModuleConfig(conf *viper.Viper, rootWorkDir, rootDataDir,
minorVersionString := version.MakeMinorVersionString(moduleName, majorVersion,
minorVersion, 0)
if !assertValidModule(module, moduleName, minorVersionString) {
- return nil, fmt.Errorf("%s module %s (%s) is not supported by %s",
+ return nil, fmt.Errorf("Error reading config: %s module %s (%s) is not supported by %s",
module, moduleName, minorVersionString, version.GetVersionString())
}
// set up the directory structure for the module inside the data directory
diff --git a/manager/eris-mint/version.go b/manager/eris-mint/version.go
index 734e5cea..c6346e93 100644
--- a/manager/eris-mint/version.go
+++ b/manager/eris-mint/version.go
@@ -26,7 +26,7 @@ const (
// Major version component of the current release
erisMintVersionMajor = 0
// Minor version component of the current release
- erisMintVersionMinor = 16
+ erisMintVersionMinor = 17
// Patch version component of the current release
erisMintVersionPatch = 0
)
diff --git a/rpc/tendermint/test/config.go b/rpc/tendermint/test/config.go
index 84fcaeb7..06f3520e 100644
--- a/rpc/tendermint/test/config.go
+++ b/rpc/tendermint/test/config.go
@@ -38,7 +38,7 @@ var defaultConfig = `# Copyright 2017 Monax Industries Limited
assert_chain_id = "MyChainId"
# semantic major and minor version
major_version = 0
-minor_version = 12
+minor_version = 17
# genesis file, relative path is to eris-db working directory
genesis_file = "genesis.json"
@@ -73,7 +73,7 @@ genesis_file = "genesis.json"
# version is the major and minor semantic version;
# the version will be asserted on
major_version = 0
- minor_version = 16
+ minor_version = 17
# relative path to application manager root folder
relative_root = "erismint"
@@ -217,7 +217,7 @@ private_validator_file = "priv_validator.json"
################################################################################
##
## Eris-Mint
-## version 0.16.0
+## version 0.17.0
##
## The original Ethereum virtual machine with IAVL merkle trees
## and tendermint/go-wire encoding
diff --git a/version/version.go b/version/version.go
index 103c787d..876fab27 100644
--- a/version/version.go
+++ b/version/version.go
@@ -30,7 +30,7 @@ const (
// Major version component of the current release
erisVersionMajor = 0
// Minor version component of the current release
- erisVersionMinor = 16
+ erisVersionMinor = 17
// Patch version component of the current release
erisVersionPatch = 0
)
@@ -127,4 +127,4 @@ func (version *VersionIdentifier) MatchesMinorVersion(
// IMPORTANT: Eris-DB version must be on the last line of this file for
// the deployment script tests/build_tool.sh to pick up the right label.
-const VERSION = "0.16.0"
+const VERSION = "0.17.0"
--
GitLab