Resolved merge conflict

.github/workflows/proto.yml

@@ -12,7 +12,7 @@ jobs:
  timeout-minutes: 5
  steps:
  - uses: actions/checkout@v3
- - uses: DoozyX/clang-format-lint-action@v0.14
+ - uses: DoozyX/clang-format-lint-action@v0.15
  with:
  source: '.'
  exclude: './third_party'

.github/workflows/test.yml

@@ -63,28 +63,27 @@ jobs:
  - name: Build
  run: GOOS=linux CGO_ENABLED=1 GOARCH=${{ matrix.goarch }} CC=${{ matrix.gcc }} LEDGER_ENABLED=false make build
 
-# TODO: disable test-cosmovisor; this test uses uploaded binary(cosmos-sdk)
-# test-cosmovisor:
-# runs-on: ubuntu-latest
-# steps:
-# - uses: actions/checkout@v3
-# - uses: actions/setup-go@v3.3.1
-# with:
-# go-version: 1.18
-# - name: Display go version
-# run: go version
-# - uses: technote-space/get-diff-action@v6.1.1
-# id: git_diff
-# with:
-# PREFIX_FILTER: |
-# cosmovisor
-# PATTERNS: |
-# **/**.go
-# go.mod
-# go.sum
-# - name: Run cosmovisor tests
-# run: cd cosmovisor; make
-# if: env.GIT_DIFF
+
+ test-cosmovisor:
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: actions/setup-go@v3.3.1
+ with:
+ go-version: 1.18
+ - name: Display go version
+ run: go version
+ - uses: technote-space/get-diff-action@v6.1.1
+ id: git_diff
+ with:
+ PATTERNS: |
+ **/**.go
+ go.mod
+ go.sum
+ tools/cosmovisor/**
+ - name: Run cosmovisor tests
+ run: make cosmovisor
+ if: env.GIT_DIFF
 
  split-test-files:
  runs-on: ubuntu-latest

CHANGELOG.md

@@ -40,6 +40,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Features
 
 ### Improvements
+* (cosmovisor) [\#792](https://github.com/line/lbm-sdk/pull/792) Use upstream's cosmovisor
 
 ### Bug Fixes
 

Makefile

@@ -139,7 +139,7 @@ $(BUILDDIR)/:
  mkdir -p $(BUILDDIR)/
 
 cosmovisor:
- $(MAKE) -C cosmovisor cosmovisor
+ $(MAKE) -C tools/cosmovisor test
 
 .PHONY: build build-linux cosmovisor