Skip to content

Commit 22c95a1

Browse files
authored
Merge pull request #48 from MVPWorkshop/bump-dep-versions
Updating dep. versions
2 parents 689269b + 8237c8b commit 22c95a1

File tree

13 files changed

+1947
-1426
lines changed

13 files changed

+1947
-1426
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "testing/builtin-actors"]
2-
path = testing/builtin-actors
3-
url = https://github.com/filecoin-project/builtin-actors
41
[submodule "lib/solidity-cborutils"]
52
path = lib/solidity-cborutils
63
url = https://github.com/smartcontractkit/solidity-cborutils

Makefile

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ build_mock_api: verify_solc deps
3838
$(solc) --optimize solidity-cborutils=${PWD}/node_modules/solidity-cborutils/ @ensdomains=${PWD}/node_modules/@ensdomains/ contracts/v0.8/mocks/MarketMockAPI.sol --output-dir ./build/v0.8/mocks --overwrite --bin --hashes --opcodes --abi
3939
$(solc) --optimize solidity-cborutils=${PWD}/node_modules/solidity-cborutils/ @ensdomains=${PWD}/node_modules/@ensdomains/ contracts/v0.8/mocks/MinerMockAPI.sol --output-dir ./build/v0.8/mocks --overwrite --bin --hashes --opcodes --abi
4040

41-
build_builtin_actors:
42-
cd testing/builtin-actors && make bundle-mainnet
43-
4441
build_leb128_test: verify_solc deps
4542
$(solc) --optimize solidity-cborutils=${PWD}/node_modules/solidity-cborutils/ @ensdomains=${PWD}/node_modules/@ensdomains/ contracts/v0.8/tests/leb128.test.sol --output-dir ./build/v0.8/tests --overwrite --bin --hashes --opcodes --abi
4643
$(solc) --optimize solidity-cborutils=${PWD}/node_modules/solidity-cborutils/ @ensdomains=${PWD}/node_modules/@ensdomains/ contracts/v0.8/tests/leb128.generated1.test.sol --output-dir ./build/v0.8/tests --overwrite --bin --hashes --opcodes --abi
@@ -88,50 +85,50 @@ test_miner_cbor_serialization:
8885
test_market_cbor_serialization:
8986
cd hardhat && yarn hardhat withdraw_balance --providerorclient 0xaaaa12 --tokenamount 12222 --contractaddress $(CONTRACT_ADDRESS)
9087

91-
test_integration: build build_builtin_actors
88+
test_integration: build
9289
cd testing && cargo test
9390

94-
test_miner_integration: build build_builtin_actors
91+
test_miner_integration: build
9592
cd testing && cargo test miner_test -- --nocapture
9693

97-
test_market_integration: build build_builtin_actors
94+
test_market_integration: build
9895
cd testing && cargo test market_test -- --nocapture
9996

100-
test_power_integration: build build_builtin_actors
97+
test_power_integration: build
10198
cd testing && cargo test power_test -- --nocapture
10299

103-
test_verifreg_integration: build build_builtin_actors
100+
test_verifreg_integration: build
104101
cd testing && cargo test verifreg_test -- --nocapture
105102

106-
test_datacap_integration: build build_builtin_actors
103+
test_datacap_integration: build
107104
cd testing && cargo test datacap_test -- --nocapture
108105

109-
test_account_integration: build build_builtin_actors
106+
test_account_integration: build
110107
cd testing && cargo test account_test -- --nocapture
111108

112-
test_precompiles_integration: build build_builtin_actors
109+
test_precompiles_integration: build
113110
cd testing && cargo test precompiles_test -- --nocapture
114111

115-
test_send_integration: build build_builtin_actors
112+
test_send_integration: build
116113
cd testing && cargo test send_test -- --nocapture
117114

118115
test_frc0042:
119116
cd testing && cargo run --example methodnum
120117

121-
test_cbor_decode: build build_builtin_actors
118+
test_cbor_decode: build
122119
cd testing && cargo test cbor_decode_test -- --nocapture
123120
cd testing && cargo test market_cbor_tests -- --nocapture
124121

125-
test_bigints: build build_builtin_actors
122+
test_bigints: build
126123
cd testing && cargo test bigints_test -- --nocapture
127124

128-
test_leb128: build build_builtin_actors
125+
test_leb128: build
129126
cd testing && cargo test leb128 -- --nocapture
130127

131-
test_deserialize: build build_builtin_actors
128+
test_deserialize: build
132129
cd testing && cargo test deserialize_params_tests -- --nocapture
133130

134-
test_address: build build_builtin_actors
131+
test_address: build
135132
cd testing && cargo test address -- --nocapture
136133

137134
################ TESTS SECURITY ################

0 commit comments

Comments
 (0)