-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into collection-import-log
- Loading branch information
Showing
47 changed files
with
410 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,7 +27,7 @@ jobs: | |
| if: "!contains(github.event.head_commit.message, 'skip-sims') && contains(github.event.pull_request.labels.*.name, 'release')" | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - run: | | ||
|
|
@@ -37,7 +37,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| needs: build | ||
| steps: | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - name: install runsim | ||
|
|
@@ -53,7 +53,7 @@ jobs: | |
| needs: [build, install-runsim] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: actions/[email protected] | ||
|
|
@@ -73,7 +73,7 @@ jobs: | |
| needs: [build, install-runsim, test-sim-multi-seed-long-part1] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: actions/[email protected] | ||
|
|
@@ -93,7 +93,7 @@ jobs: | |
| needs: [build, install-runsim, test-sim-multi-seed-long-part2] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: actions/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ jobs: | |
| install-tparse: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - name: Display go version | ||
|
|
@@ -49,7 +49,7 @@ jobs: | |
| - run: sudo apt update && sudo apt install -y ${{ matrix.package }} qemu-user-binfmt | ||
| if: "matrix.package != ''" | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: technote-space/[email protected] | ||
|
|
@@ -68,7 +68,7 @@ jobs: | |
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - name: Display go version | ||
|
|
@@ -120,7 +120,7 @@ jobs: | |
| part: ["00", "01", "02", "03"] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: technote-space/[email protected] | ||
|
|
@@ -208,7 +208,7 @@ jobs: | |
| part: ["00", "01", "02", "03"] | ||
| steps: | ||
| - uses: actions/checkout@v3 | ||
| - uses: actions/setup-go@v3.5.0 | ||
| - uses: actions/setup-go@v4.0.0 | ||
| with: | ||
| go-version: 1.18 | ||
| - uses: technote-space/[email protected] | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package keeper | ||
|
|
||
| import ( | ||
| "github.com/line/lbm-sdk/baseapp" | ||
| "github.com/line/lbm-sdk/codec" | ||
| sdk "github.com/line/lbm-sdk/types" | ||
| "github.com/line/lbm-sdk/x/foundation" | ||
| "github.com/line/lbm-sdk/x/foundation/keeper/internal" | ||
| govtypes "github.com/line/lbm-sdk/x/gov/types" | ||
| ) | ||
|
|
||
| type Keeper interface { | ||
| GetAuthority() string | ||
| Accept(ctx sdk.Context, grantee sdk.AccAddress, msg sdk.Msg) error | ||
|
|
||
| InitGenesis(ctx sdk.Context, gs *foundation.GenesisState) error | ||
| ExportGenesis(ctx sdk.Context) *foundation.GenesisState | ||
| } | ||
|
|
||
| type keeper struct { | ||
| impl internal.Keeper | ||
| } | ||
|
|
||
| func NewKeeper( | ||
| cdc codec.Codec, | ||
| key sdk.StoreKey, | ||
| router *baseapp.MsgServiceRouter, | ||
| authKeeper foundation.AuthKeeper, | ||
| bankKeeper foundation.BankKeeper, | ||
| feeCollectorName string, | ||
| config foundation.Config, | ||
| authority string, | ||
| ) Keeper { | ||
| return &keeper{ | ||
| impl: internal.NewKeeper( | ||
| cdc, | ||
| key, | ||
| router, | ||
| authKeeper, | ||
| bankKeeper, | ||
| feeCollectorName, | ||
| config, | ||
| authority, | ||
| ), | ||
| } | ||
| } | ||
|
|
||
| // GetAuthority returns the x/foundation module's authority. | ||
| func (k keeper) GetAuthority() string { | ||
| return k.impl.GetAuthority() | ||
| } | ||
|
|
||
| func (k keeper) Accept(ctx sdk.Context, grantee sdk.AccAddress, msg sdk.Msg) error { | ||
| return k.impl.Accept(ctx, grantee, msg) | ||
| } | ||
|
|
||
| func (k keeper) InitGenesis(ctx sdk.Context, gs *foundation.GenesisState) error { | ||
| return k.impl.InitGenesis(ctx, gs) | ||
| } | ||
|
|
||
| func (k keeper) ExportGenesis(ctx sdk.Context) *foundation.GenesisState { | ||
| return k.impl.ExportGenesis(ctx) | ||
| } | ||
|
|
||
| func NewMsgServer(k Keeper) foundation.MsgServer { | ||
| impl := k.(*keeper).impl | ||
| return internal.NewMsgServer(impl) | ||
| } | ||
|
|
||
| func NewQueryServer(k Keeper) foundation.QueryServer { | ||
| impl := k.(*keeper).impl | ||
| return internal.NewQueryServer(impl) | ||
| } | ||
|
|
||
| func RegisterInvariants(ir sdk.InvariantRegistry, k Keeper) { | ||
| impl := k.(*keeper).impl | ||
| internal.RegisterInvariants(ir, impl) | ||
| } | ||
|
|
||
| func BeginBlocker(ctx sdk.Context, k Keeper) { | ||
| impl := k.(*keeper).impl | ||
| internal.BeginBlocker(ctx, impl) | ||
| } | ||
|
|
||
| func EndBlocker(ctx sdk.Context, k Keeper) { | ||
| impl := k.(*keeper).impl | ||
| internal.EndBlocker(ctx, impl) | ||
| } | ||
|
|
||
| func NewFoundationProposalsHandler(k Keeper) govtypes.Handler { | ||
| impl := k.(*keeper).impl | ||
| return internal.NewFoundationProposalsHandler(impl) | ||
| } |
2 changes: 1 addition & 1 deletion
2
x/foundation/keeper/abci.go → x/foundation/keeper/internal/abci.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package keeper | ||
| package internal | ||
|
|
||
| import ( | ||
| "time" | ||
|
|
||
Oops, something went wrong.