Skip to content

Commit

Permalink
Merge branch '1.8' into bdcover
Browse files Browse the repository at this point in the history
  • Loading branch information
carryforward committed Feb 17, 2017
2 parents 17f80bc + d58cf8e commit b4e6d6c
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
@@ -1,6 +1,6 @@
language: go
go:
- 1.7.4
- 1.8
before_install:
- go get github.com/mattn/goveralls
install:
Expand Down
4 changes: 3 additions & 1 deletion common/primitives/util.go
Expand Up @@ -249,9 +249,11 @@ func ConvertECPrivateToUserStr(addr interfaces.IAddress) string {
func validateUserStr(prefix []byte, userFAddr string) bool {
if len(userFAddr) != 52 {
return false

}
v := base58.Decode(userFAddr)
if len(v) < 3 {
return false
}
if bytes.Compare(prefix, v[:2]) != 0 {
return false

Expand Down
2 changes: 2 additions & 0 deletions database/leveldb/leveldb.go
Expand Up @@ -258,6 +258,8 @@ func NewLevelDB(filename string, create bool) (interfaces.IDatabase, error) {

opts := &opt.Options{
Compression: opt.NoCompression,
OpenFilesCacheCapacity: 50, //this solves the "too many files open problem. macs have a default of 250 max open files.
// setting this lower lessens contention with other programs for the scarce open file limit.
}

tlDB, err = leveldb.OpenFile(filename, opts)
Expand Down
8 changes: 4 additions & 4 deletions engine/factomd.go
Expand Up @@ -56,10 +56,6 @@ func Factomd() {
func isCompilerVersionOK() bool {
goodenough := false

if strings.Contains(runtime.Version(), "1.4") {
goodenough = true
}

if strings.Contains(runtime.Version(), "1.5") {
goodenough = true
}
Expand All @@ -71,5 +67,9 @@ func isCompilerVersionOK() bool {
if strings.Contains(runtime.Version(), "1.7") {
goodenough = true
}

if strings.Contains(runtime.Version(), "1.8") {
goodenough = true
}
return goodenough
}
20 changes: 10 additions & 10 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit b4e6d6c

Please sign in to comment.