Skip to content

Commit

Permalink
Use ed448 gocore library instead of go-golidlocks on mobile devices +…
Browse files Browse the repository at this point in the history
…version typo fix (#451)

* Use ed448 gocore library instead of go-golidlocks on mobile devices + version typo fix (#450)

* new build constraints

* fix version typo

* Fixed CI CD build (#452)
  • Loading branch information
error2215 authored Jun 6, 2023
1 parent 7a5f6b4 commit a7f8ca5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion crypto/crypto_cgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-core library. If not, see <http://www.gnu.org/licenses/>.

//go:build !nacl && !js && cgo
//go:build !nacl && !js && cgo && !android && !ios && !mobile

package crypto

Expand Down
3 changes: 1 addition & 2 deletions crypto/crypto_nocgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-core library. If not, see <http://www.gnu.org/licenses/>.

//go:build nacl || js || !cgo
// +build nacl js !cgo
//go:build nacl || js || !cgo || android || ios || mobile

package crypto

Expand Down
2 changes: 1 addition & 1 deletion crypto/signature_cgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-core library. If not, see <http://www.gnu.org/licenses/>.

//go:build !nacl && !js && cgo
//go:build !nacl && !js && cgo && !android && !ios && !mobile

package crypto

Expand Down
3 changes: 1 addition & 2 deletions crypto/signature_nocgo.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
// You should have received a copy of the GNU Lesser General Public License
// along with the go-core library. If not, see <http://www.gnu.org/licenses/>.

//go:build nacl || js || !cgo
// +build nacl js !cgo
//go:build nacl || js || !cgo || android || ios || mobile

package crypto

Expand Down
5 changes: 3 additions & 2 deletions internal/build/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,21 @@ func LocalEnv() Environment {
if commit := commitRe.FindString(head); commit != "" && env.Commit == "" {
env.Commit = commit
}
return env
}
if env.Commit == "" {
env.Commit = readGitFile(head)
}
env.Date = getDate(env.Commit)

if env.Branch == "" {
if head != "HEAD" {
env.Branch = strings.TrimPrefix(head, "refs/heads/")
}
}
if info, err := os.Stat(".git/objects"); err == nil && info.IsDir() && env.Tag == "" {
env.Tag = firstLine(RunGit("describe", "--tags", "--abbrev=0"))
env.Tag = firstLine(RunGit("tag", "-l", "--points-at", "HEAD"))
}

return env
}

Expand Down
2 changes: 1 addition & 1 deletion node/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func (c *Config) NodeName() string {
name += "/" + c.UserIdent
}
if c.Version != "" {
name += "/v" + c.Version
name += "/" + c.Version
}
name += "/" + runtime.GOOS + "-" + runtime.GOARCH
name += "/" + runtime.Version()
Expand Down
4 changes: 2 additions & 2 deletions p2p/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ func (p *Peer) Node() *enode.Node {
// Name returns an abbreviated form of the name
func (p *Peer) Name() string {
s := p.rw.name
if len(s) > 20 {
return s[:20] + "..."
if len(s) > 50 {
return s[:50] + "..."
}
return s
}
Expand Down

0 comments on commit a7f8ca5

Please sign in to comment.