Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into update-v47
Browse files Browse the repository at this point in the history
  • Loading branch information
RexMilce committed Aug 6, 2023
2 parents eac6041 + 0143678 commit deb1479
Show file tree
Hide file tree
Showing 4,354 changed files with 800,343 additions and 16,822 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/consensus_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fetch-depth: '0'
- uses: actions/setup-go@v3
with:
go-version: 1.18.2
go-version: 1.20.5


# Setup Paths
Expand Down
166 changes: 148 additions & 18 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ name: Lava E2E Tests
on: [pull_request]

jobs:
go:
test-protocol-e2e:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: '0'
- uses: actions/setup-go@v3
with:
go-version: 1.19.11
go-version: 1.20.5

# Install Ignite
- name: ignite install
Expand Down Expand Up @@ -61,71 +61,201 @@ jobs:
### Run Lava E2E Tests IGNITE VERSION:0.22.1
######################################################
- name: Run Lava E2E Tests IGNITE VERSION:0.22.1 -timeout 1200s
run: go test ./testutil/e2e/ -v -timeout 1200s # 20mins
run: go test ./testutil/e2e/ -run ^TestLavaProtocol$ -v -timeout 1200s # 20mins

- name: Stake Lava All Logs
if: always()
run: cat testutil/e2e/logs/01_stakeLava.log
run: cat testutil/e2e/protocolLogs/01_stakeLava.log

- name: Stake Lava Error Only Logs
if: always()
continue-on-error: true
run: cat testutil/e2e/logs/01_stakeLava_errors.log
run: cat testutil/e2e/protocolLogs/01_stakeLava_errors.log

- name: head -n 300 JSON Proxy Logs
if: always()
run: head -n 300 testutil/e2e/logs/02_jsonProxy.log
run: head -n 300 testutil/e2e/protocolLogs/02_jsonProxy.log

- name: tail -n 300 JSON Proxy Logs
if: always()
run: tail -n 300 testutil/e2e/logs/02_jsonProxy.log
run: tail -n 300 testutil/e2e/protocolLogs/02_jsonProxy.log

- name: JSON Proxy Error Only Logs
if: always()
continue-on-error: true
run: cat testutil/e2e/logs/02_jsonProxy_errors.log
run: cat testutil/e2e/protocolLogs/02_jsonProxy_errors.log

- name: JSON Provider All Logs
if: always()
run: grep "" testutil/e2e/logs/03_EthProvider* --exclude="*errors*"
run: grep "" testutil/e2e/protocolLogs/03_EthProvider* --exclude="*errors*"

- name: JSON Provider Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/logs/03_EthProvider* --include="*errors*"
run: grep "" testutil/e2e/protocolLogs/03_EthProvider* --include="*errors*"

- name: JSON Consumer All Logs
if: always()
run: grep "" testutil/e2e/logs/04_jsonConsumer* --exclude="*errors*"
run: grep "" testutil/e2e/protocolLogs/04_jsonConsumer* --exclude="*errors*"

- name: JSON Consumer Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/logs/04_jsonConsumer* --include="*errors*"
run: grep "" testutil/e2e/protocolLogs/04_jsonConsumer* --include="*errors*"

- name: Lava Provider All Logs
if: always()
run: grep "" testutil/e2e/logs/05_LavaProvider* --exclude="*errors*"
run: grep "" testutil/e2e/protocolLogs/05_LavaProvider* --exclude="*errors*"

- name: Lava Provider Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/logs/05_LavaProvider* --include="*errors*"
run: grep "" testutil/e2e/protocolLogs/05_LavaProvider* --include="*errors*"

- name: Lava over Lava All Logs
if: always()
run: cat testutil/e2e/logs/07_lavaOverLava.log
run: cat testutil/e2e/protocolLogs/07_lavaOverLava.log

- name: Lava over Lava Error Only Logs
if: always()
continue-on-error: true
run: cat testutil/e2e/logs/07_lavaOverLava_errors.log
run: cat testutil/e2e/protocolLogs/07_lavaOverLava_errors.log

- name: RPCConsumer Consumer All Logs
if: always()
run: grep "" testutil/e2e/logs/06_RPCConsumer* --exclude="*errors*"
run: grep "" testutil/e2e/protocolLogs/06_RPCConsumer* --exclude="*errors*"

- name: RPCConsumer Consumer Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/logs/06_RPCConsumer* --include="*errors*"
run: grep "" testutil/e2e/protocolLogs/06_RPCConsumer* --include="*errors*"
test-sdk-e2e:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: '0'
- uses: actions/setup-go@v3
with:
go-version: 1.20.5

# Install Ignite
- name: ignite install
run: git clone --depth 1 --branch v0.26.1 https://github.com/ignite/cli && cd cli && make install
# run: curl https://get.ignite.com/cli! | bash
- name: ignite version
run: ignite version
# - name: starport install
# run: curl https://get.starport.network/[email protected]! | bash
# - name: starport version
# run: starport version

# Setup Paths
- name: home
run: pwd && ls -l
- name: ls usr
run: ls -l /home/runner/work/lava/lava
- name: cp lava
run: cp -r ~/work/lava/lava ~/go/lava
- name: export PATH
run: export PATH=$PATH:/go:/go/bin:$(go env GOPATH)/bin:/usr/local:`pwd`:/home/runner/work/lava/lava/
# - name: export
# run: export PATH=$PATH:/go/lava
- name: export GOPATH
run: export GOPATH=$GOPATH:$(go env GOPATH):/go:/go/lava:/usr/local:`pwd`
- name: export LAVA
run: export LAVA=/home/runner/work/lava/lava
- name: go env
run: go env
- name: pwd
run: pwd
- name: tree
run: tree
- name: ls -l
run: ls -l

# Pre-build with ignite
- name: ignite build
uses: nick-fields/retry@v2
with:
max_attempts: 3
retry_on: error
timeout_minutes: 20
command: ignite chain build -v

# Install Node.js
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 20

# Install dependencies and build
- name: Install dependencies and build
run: |
cd ecosystem/lava-sdk
npm install
npm run build
######################################################
### Run Lava E2E Tests IGNITE VERSION:0.22.1
######################################################
- name: Run Lava E2E Tests IGNITE VERSION:0.22.1 -timeout 1200s
run: go test ./testutil/e2e/ -run ^TestLavaSDK -v -timeout 1200s # 20mins

- name: Stake Lava All Logs
if: always()
run: cat testutil/e2e/sdkLogs/01_stakeLava.log

- name: Stake Lava Error Only Logs
if: always()
continue-on-error: true
run: cat testutil/e2e/sdkLogs/01_stakeLava_errors.log

- name: head -n 300 JSON Proxy Logs
if: always()
run: head -n 300 testutil/e2e/sdkLogs/02_jsonProxy.log

- name: tail -n 300 JSON Proxy Logs
if: always()
run: tail -n 300 testutil/e2e/sdkLogs/02_jsonProxy.log

- name: JSON Proxy Error Only Logs
if: always()
continue-on-error: true
run: cat testutil/e2e/sdkLogs/02_jsonProxy_errors.log

- name: JSON Provider All Logs
if: always()
run: grep "" testutil/e2e/sdkLogs/03_EthProvider* --exclude="*errors*"

- name: JSON Provider Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/sdkLogs/03_EthProvider* --include="*errors*"

- name: Lava Provider All Logs
if: always()
run: grep "" testutil/e2e/sdkLogs/05_LavaProvider* --exclude="*errors*"

- name: Lava Provider Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/sdkLogs/05_LavaProvider* --include="*errors*"

- name: Badge Server All Logs
if: always()
run: grep "" testutil/e2e/sdkLogs/01_BadgeServer* --exclude="*errors*"

- name: Badge Server Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/sdkLogs/01_BadgeServer* --include="*errors*"

- name: Lava SDK All Logs
if: always()
run: grep "" testutil/e2e/sdkLogs/01_sdkTest* --exclude="*errors*"

- name: Lava SDK Error Only Logs
if: always()
continue-on-error: true
run: grep "" testutil/e2e/sdkLogs/01_sdkTest* --include="*errors*"
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v3
with:
go-version: 1.18.x
go-version: 1.20.5

- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/protocol_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fetch-depth: '0'
- uses: actions/setup-go@v3
with:
go-version: 1.18.2
go-version: 1.20.5


# Setup Paths
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Configure Go
uses: actions/setup-go@v3
with:
go-version: '^1.18.2'
go-version: 1.20.5
check-latest: true
cache: true

Expand Down
20 changes: 17 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,26 @@ vue/dist

# Logs and debug
scripts/automation_scripts/automation_results*
testutil/e2e/logs/
testutil/e2e/protocolLogs/
testutil/e2e/sdkLogs/
testutil/debugging/

# Misc
scripts/vars/
rpcprovider.yml
rpcconsumer.yml

# Node modules
**/node_modules

# Pairing lsit
**/pairingList.json

# Lava SDK ignores
ecosystem/lava-sdk/node_modules/*
ecosystem/lava-sdk/src/js/*
ecosystem/lava-sdk/dist/main.js
ecosystem/lava-sdk/thirdparty_protobufs/*
ecosystem/lava-sdk/proto/*
ecosystem/lava-sdk/dist/*
ecosystem/lava-sdk/.dccache
ecosystem/lava-sdk/.idea
Expand All @@ -47,6 +53,14 @@ ecosystem/lava-sdk/examples/tendermintRPC_test.ts
ecosystem/lava-sdk/examples/tendermintRPC_test2.ts
ecosystem/lava-sdk/examples/jsonRPC_badge_test.ts
ecosystem/lava-sdk/pairingList.json
# ecosystem/lava-sdk/proto/**/*[!.proto] #tried but didnt work
ecosystem/lava-sdk/proto/**/*.yaml
ecosystem/lava-sdk/proto/**/*.bazel
ecosystem/lava-sdk/proto/**/*.bzl
ecosystem/lava-sdk/proto/**/*.md
ecosystem/lava-sdk/proto/**/*.sh
ecosystem/lava-sdk/proto/**/*.json
ecosystem/lava-sdk/proto/**/*.go

# Ignore the bin and dist folders and their content
ecosystem/lava-sdk/bin/examples
Expand All @@ -63,4 +77,4 @@ ecosystem/lava-sdk/bin/src/wallet

ecosystem/lava-sdk/dist/*

# But don't ignore the specific folder inside the bin folder
# But don't ignore the specific folder inside the bin folder
Loading

0 comments on commit deb1479

Please sign in to comment.