Skip to content

Commit c44c2ea

Browse files
mur-meFrozensophoah
authored
feat/keep tests in separate repo for upgrade to 1.22 (#4736)
* Test. * 1.21.11 * Fixed rosetta * Fixed bootstrap * Custom genesis generation for [email protected]+. * Fixed 1.19 imports. * Fixed 1.19 imports. * Replaced 1.20 keys. * 100% coverage. * Fixed trailing zeroes. * Rebased & Fixed protobuf usage. * Compatibility with [email protected]. * Regenerated proto files to the latest version. * Disabled transport security. * [email protected] * fix: add fetch to the the travis scripts * fix: point travis to the 1.22 golang tests * set p2p NoTransportSecurity default to false * feat(go version) - bump go version in Dockerfiles and README.md * Go 1.22 tags. --------- Co-authored-by: frozen <[email protected]> Co-authored-by: Nita Neou (Soph) <[email protected]>
1 parent 5ec19bc commit c44c2ea

30 files changed

+732
-540
lines changed

Diff for: .dockerignore

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,15 @@
1-
*
2-
!scripts/docker
1+
harmony_db*
2+
bin
3+
cache
4+
.DS_Store
5+
*.log
6+
log-*
7+
tmp_log
8+
*.rlp
9+
**/*.rlp
10+
.hmykey
11+
db-127.0.0.1-*
12+
db*
13+
.dht
14+
.dht-*
15+
explorer_storage_*

Diff for: .travis.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ os: linux
22
dist: jammy
33
language: go
44
go:
5-
- 1.19.5
5+
- 1.22.5
66
go_import_path: github.com/harmony-one/harmony
77
cache:
88
directories:
@@ -24,9 +24,11 @@ install:
2424
# /home/travis/gopath/src/github.com/harmony-one/harmony
2525
# https://docs.travis-ci.com/user/languages/go/#go-import-path
2626
- echo $TRAVIS_PULL_REQUEST_BRANCH
27-
- TEST_REPO_BRANCH="master"
27+
#TODO: return back to master
28+
- TEST_REPO_BRANCH="feature/go1.22"
2829
- git clone https://github.com/harmony-one/mcl.git $GOPATH/src/github.com/harmony-one/mcl
2930
- git clone https://github.com/harmony-one/bls.git $GOPATH/src/github.com/harmony-one/bls
31+
#TODO: return back harmony instead of personal fork
3032
- git clone --branch $TEST_REPO_BRANCH https://github.com/harmony-one/harmony-test.git $GOPATH/src/github.com/harmony-one/harmony-test
3133
- (cd $GOPATH/src/github.com/harmony-one/mcl; make -j4)
3234
- (cd $GOPATH/src/github.com/harmony-one/bls; make BLS_SWAP_G=1 -j4)

Diff for: Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:22.04
22

33
ARG TARGETARCH
4-
ARG GOLANG_VERSION="1.19"
4+
ARG GOLANG_VERSION="1.22.5"
55

66
SHELL ["/bin/bash", "-c"]
77

Diff for: Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ trace-pointer:
7070

7171
debug:
7272
rm -rf .dht-127.0.0.1*
73+
# uncomment the following lines to enable debug logging for libp2p, it produces a lot of logs, so disabled by default
74+
#export GOLOG_LOG_LEVEL=debug
75+
#export GOLOG_OUTPUT=stdout
7376
bash ./test/debug.sh
7477

7578
debug-kill:
@@ -200,3 +203,6 @@ debug_external: clean
200203

201204
build_localnet_validator:
202205
bash test/build-localnet-validator.sh
206+
207+
protofiles:
208+
bash ./scripts/gogenerate.sh

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ http://api.hmny.io/
1616

1717
## Requirements
1818

19-
### **Go 1.19**
19+
### **Go 1.22.5**
2020
### **GMP and OpenSSL**
2121

2222
On macOS:

Diff for: api/proto/message/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package message
1+
package harmonymessage
22

33
import (
44
"context"

Diff for: api/proto/message/gen.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
22

3-
docker run --platform linux/amd64 -v ${PWD}:/tmp ${PROTOC_IMAGE} /tmp/message.proto
3+
docker run --platform linux/amd64 -v ${PWD}:/tmp ${PROTOC_IMAGE} /tmp/harmonymessage.proto

0 commit comments

Comments
 (0)