Skip to content

Commit d5ef635

Browse files
authored
test: cleanup EVM test contracts (#1603)
We only need the .hex files now.
1 parent 6967a23 commit d5ef635

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+13
-76
lines changed

actors/evm/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ test-contracts: $(TEST_CONTRACTS_HEX)
1919

2020
# Compile a Solidity test contract
2121
$(TEST_CONTRACTS_DIR)/%.hex: $(TEST_CONTRACTS_DIR)/%.sol | solc
22-
@# Generate the .hex file which is the same as the .bin, but .bin would be renamed by solc to use CamelCase.
23-
@# We could use just the .bin files in the test, but this is a way to stick to the existing pattern.
2422
solc --bin $< | sed '4q;d' | tr -d '\n' > $@
25-
solc --bin --abi --storage-layout --hashes --overwrite $< -o $(TEST_CONTRACTS_DIR)
2623

2724
$(TEST_CONTRACTS_DIR)/callvariants.hex: $(TEST_CONTRACTS_DIR)/callvariants.eas $(TEST_CONTRACTS_DIR)/callvariants_body.eas
2825
eas $(TEST_CONTRACTS_DIR)/callvariants.eas | tr -d '\n' > $(TEST_CONTRACTS_DIR)/callvariants.hex

actors/evm/tests/basic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ fn test_push_last_byte() {
206206
#[test]
207207
fn transient_storage() {
208208
let transient_storage_bytecode =
209-
hex::decode(include_str!("contracts/TransientStorageTest.bin")).unwrap();
209+
hex::decode(include_str!("contracts/TransientStorageTest.hex")).unwrap();
210210
transient_storage_test(transient_storage_bytecode);
211211
}
212212

actors/evm/tests/contracts/CallActorPrecompile.abi

Lines changed: 0 additions & 1 deletion
This file was deleted.

actors/evm/tests/contracts/CallActorPrecompile.bin

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
608060405234801561001057600080fd5b50610994806100206000396000f3fe608060405234801561001057600080fd5b50600436106100365760003560e01c80636aba510b1461003b5780637f18c2201461006e575b600080fd5b61005560048036038101906100509190610375565b6100a1565b60405161006594939291906104f7565b60405180910390f35b61008860048036038101906100839190610543565b610192565b60405161009894939291906104f7565b60405180910390f35b6000806000606060008073fe0000000000000000000000000000000000000573ffffffffffffffffffffffffffffffffffffffff168d8d8d8d8d8d8d6040516020016100f3979695949392919061065d565b60405160208183030381529060405260405161010f9190610703565b600060405180830381855af49150503d806000811461014a576040519150601f19603f3d011682016040523d82523d6000602084013e61014f565b606091505b509150915060008060008380602001905181019061016d919061087c565b9250925092508483838398509850985098505050505050975097509750979350505050565b6000806000606060008073fe0000000000000000000000000000000000000373ffffffffffffffffffffffffffffffffffffffff168e8e8e8e8e8e8e8e6040516020016101e69897969594939291906108eb565b6040516020818303038152906040526040516102029190610703565b600060405180830381855af49150503d806000811461023d576040519150601f19603f3d011682016040523d82523d6000602084013e610242565b606091505b5091509150600080600083806020019051810190610260919061087c565b925092509250848383839850985098509850505050505098509850985098945050505050565b6000604051905090565b600080fd5b600080fd5b600067ffffffffffffffff82169050919050565b6102b78161029a565b81146102c257600080fd5b50565b6000813590506102d4816102ae565b92915050565b6000819050919050565b6102ed816102da565b81146102f857600080fd5b50565b60008135905061030a816102e4565b92915050565b600080fd5b600080fd5b600080fd5b60008083601f84011261033557610334610310565b5b8235905067ffffffffffffffff81111561035257610351610315565b5b60208301915083600182028301111561036e5761036d61031a565b5b9250929050565b600080600080600080600060c0888a03121561039457610393610290565b5b60006103a28a828b016102c5565b97505060206103b38a828b016102fb565b96505060406103c48a828b016102c5565b95505060606103d58a828b016102c5565b945050608088013567ffffffffffffffff8111156103f6576103f5610295565b5b6104028a828b0161031f565b935093505060a06104158a828b016102c5565b91505092959891949750929550565b60008115159050919050565b61043981610424565b82525050565b6000819050919050565b6104528161043f565b82525050565b6104618161029a565b82525050565b600081519050919050565b600082825260208201905092915050565b60005b838110156104a1578082015181840152602081019050610486565b60008484015250505050565b6000601f19601f8301169050919050565b60006104c982610467565b6104d38185610472565b93506104e3818560208601610483565b6104ec816104ad565b840191505092915050565b600060808201905061050c6000830187610430565b6105196020830186610449565b6105266040830185610458565b818103606083015261053881846104be565b905095945050505050565b60008060008060008060008060c0898b03121561056357610562610290565b5b60006105718b828c016102c5565b98505060206105828b828c016102fb565b97505060406105938b828c016102c5565b96505060606105a48b828c016102c5565b955050608089013567ffffffffffffffff8111156105c5576105c4610295565b5b6105d18b828c0161031f565b945094505060a089013567ffffffffffffffff8111156105f4576105f3610295565b5b6106008b828c0161031f565b92509250509295985092959890939650565b61061b816102da565b82525050565b82818337600083830152505050565b600061063c8385610472565b9350610649838584610621565b610652836104ad565b840190509392505050565b600060c082019050610672600083018a610458565b61067f6020830189610612565b61068c6040830188610458565b6106996060830187610458565b81810360808301526106ac818587610630565b90506106bb60a0830184610458565b98975050505050505050565b600081905092915050565b60006106dd82610467565b6106e781856106c7565b93506106f7818560208601610483565b80840191505092915050565b600061070f82846106d2565b915081905092915050565b6107238161043f565b811461072e57600080fd5b50565b6000815190506107408161071a565b92915050565b600081519050610755816102ae565b92915050565b600080fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b610798826104ad565b810181811067ffffffffffffffff821117156107b7576107b6610760565b5b80604052505050565b60006107ca610286565b90506107d6828261078f565b919050565b600067ffffffffffffffff8211156107f6576107f5610760565b5b6107ff826104ad565b9050602081019050919050565b600061081f61081a846107db565b6107c0565b90508281526020810184848401111561083b5761083a61075b565b5b610846848285610483565b509392505050565b600082601f83011261086357610862610310565b5b815161087384826020860161080c565b91505092915050565b60008060006060848603121561089557610894610290565b5b60006108a386828701610731565b93505060206108b486828701610746565b925050604084015167ffffffffffffffff8111156108d5576108d4610295565b5b6108e18682870161084e565b9150509250925092565b600060c082019050610900600083018b610458565b61090d602083018a610612565b61091a6040830189610458565b6109276060830188610458565b818103608083015261093a818688610630565b905081810360a083015261094f818486610630565b9050999850505050505050505056fea2646970667358221220515f7933bf6da59fa92065c38d853b75e241eda832bbaccdf9a8ca357aa6167964736f6c63430008110033
1+
6080604052348015600e575f80fd5b506109308061001c5f395ff3fe608060405234801561000f575f80fd5b5060043610610034575f3560e01c80636aba510b146100385780637f18c2201461006b575b5f80fd5b610052600480360381019061004d9190610355565b61009e565b60405161006294939291906104b0565b60405180910390f35b610085600480360381019061008091906104fa565b610187565b60405161009594939291906104b0565b60405180910390f35b5f805f60605f8073fe0000000000000000000000000000000000000573ffffffffffffffffffffffffffffffffffffffff168d8d8d8d8d8d8d6040516020016100ed979695949392919061060d565b60405160208183030381529060405260405161010991906106af565b5f60405180830381855af49150503d805f8114610141576040519150601f19603f3d011682016040523d82523d5f602084013e610146565b606091505b50915091505f805f83806020019051810190610162919061081d565b9250925092508483838398509850985098505050505050975097509750979350505050565b5f805f60605f8073fe0000000000000000000000000000000000000373ffffffffffffffffffffffffffffffffffffffff168e8e8e8e8e8e8e8e6040516020016101d8989796959493929190610889565b6040516020818303038152906040526040516101f491906106af565b5f60405180830381855af49150503d805f811461022c576040519150601f19603f3d011682016040523d82523d5f602084013e610231565b606091505b50915091505f805f8380602001905181019061024d919061081d565b925092509250848383839850985098509850505050505098509850985098945050505050565b5f604051905090565b5f80fd5b5f80fd5b5f67ffffffffffffffff82169050919050565b6102a081610284565b81146102aa575f80fd5b50565b5f813590506102bb81610297565b92915050565b5f819050919050565b6102d3816102c1565b81146102dd575f80fd5b50565b5f813590506102ee816102ca565b92915050565b5f80fd5b5f80fd5b5f80fd5b5f8083601f840112610315576103146102f4565b5b8235905067ffffffffffffffff811115610332576103316102f8565b5b60208301915083600182028301111561034e5761034d6102fc565b5b9250929050565b5f805f805f805f60c0888a0312156103705761036f61027c565b5b5f61037d8a828b016102ad565b975050602061038e8a828b016102e0565b965050604061039f8a828b016102ad565b95505060606103b08a828b016102ad565b945050608088013567ffffffffffffffff8111156103d1576103d0610280565b5b6103dd8a828b01610300565b935093505060a06103f08a828b016102ad565b91505092959891949750929550565b5f8115159050919050565b610413816103ff565b82525050565b5f819050919050565b61042b81610419565b82525050565b61043a81610284565b82525050565b5f81519050919050565b5f82825260208201905092915050565b8281835e5f83830152505050565b5f601f19601f8301169050919050565b5f61048282610440565b61048c818561044a565b935061049c81856020860161045a565b6104a581610468565b840191505092915050565b5f6080820190506104c35f83018761040a565b6104d06020830186610422565b6104dd6040830185610431565b81810360608301526104ef8184610478565b905095945050505050565b5f805f805f805f8060c0898b0312156105165761051561027c565b5b5f6105238b828c016102ad565b98505060206105348b828c016102e0565b97505060406105458b828c016102ad565b96505060606105568b828c016102ad565b955050608089013567ffffffffffffffff81111561057757610576610280565b5b6105838b828c01610300565b945094505060a089013567ffffffffffffffff8111156105a6576105a5610280565b5b6105b28b828c01610300565b92509250509295985092959890939650565b6105cd816102c1565b82525050565b828183375f83830152505050565b5f6105ec838561044a565b93506105f98385846105d3565b61060283610468565b840190509392505050565b5f60c0820190506106205f83018a610431565b61062d60208301896105c4565b61063a6040830188610431565b6106476060830187610431565b818103608083015261065a8185876105e1565b905061066960a0830184610431565b98975050505050505050565b5f81905092915050565b5f61068982610440565b6106938185610675565b93506106a381856020860161045a565b80840191505092915050565b5f6106ba828461067f565b915081905092915050565b6106ce81610419565b81146106d8575f80fd5b50565b5f815190506106e9816106c5565b92915050565b5f815190506106fd81610297565b92915050565b5f80fd5b7f4e487b71000000000000000000000000000000000000000000000000000000005f52604160045260245ffd5b61073d82610468565b810181811067ffffffffffffffff8211171561075c5761075b610707565b5b80604052505050565b5f61076e610273565b905061077a8282610734565b919050565b5f67ffffffffffffffff82111561079957610798610707565b5b6107a282610468565b9050602081019050919050565b5f6107c16107bc8461077f565b610765565b9050828152602081018484840111156107dd576107dc610703565b5b6107e884828561045a565b509392505050565b5f82601f830112610804576108036102f4565b5b81516108148482602086016107af565b91505092915050565b5f805f606084860312156108345761083361027c565b5b5f610841868287016106db565b9350506020610852868287016106ef565b925050604084015167ffffffffffffffff81111561087357610872610280565b5b61087f868287016107f0565b9150509250925092565b5f60c08201905061089c5f83018b610431565b6108a9602083018a6105c4565b6108b66040830189610431565b6108c36060830188610431565b81810360808301526108d68186886105e1565b905081810360a08301526108eb8184866105e1565b9050999850505050505050505056fea2646970667358221220cadcb043032d8425fcf507a9364ad9d03dec1562f9f4da49feb7a226b6b9e08464736f6c634300081a0033

actors/evm/tests/contracts/CallActorPrecompile.signatures

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

actors/evm/tests/contracts/CallActorPrecompile.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// SPDX-License-Identifier: Apache-2.0 MIT
2-
pragma solidity >=0.4.25 <=0.8.17;
2+
pragma solidity >=0.4.25 <=0.8.26;
33

44
contract CallActorPrecompile {
55
address constant CALL_ACTOR_ADDRESS = 0xfe00000000000000000000000000000000000003;

actors/evm/tests/contracts/CallActorPrecompile_storage.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

actors/evm/tests/contracts/Factory.abi

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)