Skip to content
Snippets Groups Projects
Commit 0bf406d9 authored by Benjamin Bollen's avatar Benjamin Bollen
Browse files

make AssertCompatibleConsensus return error instead of bool

parent 1d741294
No related branches found
No related tags found
No related merge requests found
...@@ -28,8 +28,6 @@ func TestCompatibleConsensus(t *testing.T) { ...@@ -28,8 +28,6 @@ func TestCompatibleConsensus(t *testing.T) {
// compatible consensus engine // compatible consensus engine
for _, listedConsensus := range compatibleConsensus { for _, listedConsensus := range compatibleConsensus {
assert.Equal(t, IsCompatibleConsensus(listedConsensus), true, assert.Nil(t, AssertCompatibleConsensus(listedConsensus))
fmt.Sprintf("ErisMint (%s) failed compatibility test with consensus %s",
GetErisMintVersion(), listedConsensus))
} }
} }
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
package erismint package erismint
import ( import (
"fmt"
version "github.com/eris-ltd/eris-db/version" version "github.com/eris-ltd/eris-db/version"
) )
...@@ -43,11 +45,12 @@ func GetErisMintVersion() *version.VersionIdentifier { ...@@ -43,11 +45,12 @@ func GetErisMintVersion() *version.VersionIdentifier {
erisMintVersionMinor, erisMintVersionPatch) erisMintVersionMinor, erisMintVersionPatch)
} }
func IsCompatibleConsensus(consensusMinorVersion string) bool { func AssertCompatibleConsensus(consensusMinorVersion string) error {
for _, supported := range compatibleConsensus { for _, supported := range compatibleConsensus {
if consensusMinorVersion == supported { if consensusMinorVersion == supported {
return true return nil
} }
} }
return false return fmt.Errorf("ErisMint (%s) is not compatible with consensus engine %s",
GetErisMintVersion(), consensusMinorVersion)
} }
...@@ -34,7 +34,9 @@ func NewApplication(moduleConfig *config.ModuleConfig, ...@@ -34,7 +34,9 @@ func NewApplication(moduleConfig *config.ModuleConfig,
error) { error) {
switch moduleConfig.Name { switch moduleConfig.Name {
case "erismint" : case "erismint" :
if err := erismint.AssertCompatibleConsensus(consensusMinorVersion); err != nil {
return nil, err
}
return newErisMintPH(moduleConfig) return newErisMintPH(moduleConfig)
} }
return nil, fmt.Errorf("PLACEHOLDER") return nil, fmt.Errorf("PLACEHOLDER")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment