Skip to content

Commit cbc585b

Browse files
committed
chore: updated the branch with the latest version of master in injective core (for v1.16)
1 parent 5824e4e commit cbc585b

32 files changed

+628
-918
lines changed

.golangci.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
1+
version: "2"
12
linters:
23
fast: false
34
enable:
45
- errcheck
56
- errorlint
6-
- gas
77
- gocritic
8-
- gofmt
9-
- goimports
10-
- gosimple
118
- govet
129
- ineffassign
13-
- megacheck
1410
- misspell
1511
- nakedret
1612
- prealloc
1713
- revive
18-
- staticcheck
1914
- unconvert
2015
- unparam
2116
disable:
@@ -27,12 +22,16 @@ linters-settings:
2722
rules:
2823
- name: var-naming
2924
arguments:
30-
- ["ID"]
25+
- - ID
3126
- name: add-constant
3227
disabled: true
3328
- name: line-length-limit
3429
arguments:
3530
- 140
31+
- name: cognitive-complexity
32+
arguments:
33+
- 20
34+
disabled: false
3635
gocritic:
3736
enabled-tags:
3837
- performance
@@ -57,6 +56,11 @@ issues:
5756
- proto
5857
- client/keyring/testdata
5958
max-issues-per-linter: 0
59+
formatters:
60+
exclusions:
61+
generated: lax
62+
paths:
63+
- chain$
6064

6165
run:
6266
tests: false

Makefile

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,27 @@ copy-chain-types: clone-injective-core
5252
cp injective-core/injective-chain/modules/auction/types/*.pb.go chain/auction/types && \
5353
cp injective-core/injective-chain/modules/auction/types/codec.go chain/auction/types
5454
mkdir -p chain/erc20/types && \
55-
cp injective-core/injective-chain/modules/erc20/types/*.go chain/erc20/types && \
56-
rm -rf chain/erc20/types/*test.go && rm -rf chain/erc20/types/*gw.go
55+
cp injective-core/injective-chain/modules/erc20/types/*.pb.go chain/erc20/types && \
56+
cp injective-core/injective-chain/modules/erc20/types/codec.go chain/erc20/types
5757
mkdir -p chain/evm/types && \
58-
cp injective-core/injective-chain/modules/evm/types/*.go chain/evm/types && \
59-
rm -rf chain/evm/types/*test.go && rm -rf chain/evm/types/*gw.go
58+
cp injective-core/injective-chain/modules/evm/types/*.pb.go chain/evm/types && \
59+
cp injective-core/injective-chain/modules/evm/types/access_list.go chain/evm/types && \
60+
cp injective-core/injective-chain/modules/evm/types/access_list_tx.go chain/evm/types && \
61+
cp injective-core/injective-chain/modules/evm/types/chain_config.go chain/evm/types && \
62+
cp injective-core/injective-chain/modules/evm/types/codec.go chain/evm/types && \
63+
cp injective-core/injective-chain/modules/evm/types/dynamic_fee_tx.go chain/evm/types && \
64+
cp injective-core/injective-chain/modules/evm/types/errors.go chain/evm/types && \
65+
cp injective-core/injective-chain/modules/evm/types/eth.go chain/evm/types && \
66+
cp injective-core/injective-chain/modules/evm/types/events.go chain/evm/types && \
67+
cp injective-core/injective-chain/modules/evm/types/key.go chain/evm/types && \
68+
cp injective-core/injective-chain/modules/evm/types/legacy_tx.go chain/evm/types && \
69+
cp injective-core/injective-chain/modules/evm/types/logs.go chain/evm/types && \
70+
cp injective-core/injective-chain/modules/evm/types/msg.go chain/evm/types && \
71+
cp injective-core/injective-chain/modules/evm/types/params.go chain/evm/types && \
72+
cp injective-core/injective-chain/modules/evm/types/storage.go chain/evm/types && \
73+
cp injective-core/injective-chain/modules/evm/types/tx.go chain/evm/types && \
74+
cp injective-core/injective-chain/modules/evm/types/tx_data.go chain/evm/types && \
75+
cp injective-core/injective-chain/modules/evm/types/utils.go chain/evm/types
6076
mkdir -p chain/exchange/types && \
6177
cp injective-core/injective-chain/modules/exchange/types/*.go chain/exchange/types && \
6278
rm -rf chain/exchange/types/*test.go && rm -rf chain/exchange/types/*gw.go
@@ -123,7 +139,9 @@ copy-chain-types: clone-injective-core
123139
mkdir -p chain/types && \
124140
cp injective-core/injective-chain/types/*.pb.go injective-core/injective-chain/types/config.go chain/types && \
125141
cp injective-core/injective-chain/types/codec.go chain/types && \
126-
cp injective-core/injective-chain/types/util.go chain/types
142+
cp injective-core/injective-chain/types/int.go chain/types && \
143+
cp injective-core/injective-chain/types/util.go chain/types && \
144+
cp injective-core/injective-chain/types/validation.go chain/types
127145

128146
@find ./chain -type f -name "*.go" -exec sed -i "" -e "s|github.com/InjectiveLabs/injective-core/injective-chain/modules|github.com/InjectiveLabs/sdk-go/chain|g" {} \;
129147
@find ./chain -type f -name "*.go" -exec sed -i "" -e "s|github.com/InjectiveLabs/injective-core/injective-chain|github.com/InjectiveLabs/sdk-go/chain|g" {} \;

chain/erc20/types/errors.go

Lines changed: 0 additions & 20 deletions
This file was deleted.

chain/erc20/types/expected_keepers.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

chain/erc20/types/genesis.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

chain/erc20/types/msgs.go

Lines changed: 0 additions & 90 deletions
This file was deleted.

chain/erc20/types/params.go

Lines changed: 0 additions & 29 deletions
This file was deleted.

chain/erc20/types/types.go

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)