Skip to content

Commit

Permalink
Fix the CryptoZombies test. (#3611)
Browse files Browse the repository at this point in the history
The regression was due to an invalid zombieAttack.bin imported
in e350e29 (#3299). Hereby reverted to the original from cc4ec1f.

This also removes an annoying build warning introduced in 8a45140.
  • Loading branch information
artob committed Nov 17, 2020
1 parent 60fb45c commit f5429cb
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion runtime/near-evm-runner/tests/build/zombieAttack.bin
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6080604052610a87806100136000396000f3fe6080604052600436106100705760003560e01c8063299fb0431161004e578063299fb043146101af5780632ccb1b30146101c65780639d9f9a6e14610235578063b69ef8a81461028657610070565b80630a84cba514610072578063111e0b12146100e757806314d54f541461015c575b005b61009e6004803603602081101561008857600080fd5b81019080803590602001909291905050506102b1565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390f35b610113600480360360208110156100fd57600080fd5b8101908080359060200190929190505050610390565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390f35b34801561016857600080fd5b506101956004803603602081101561017f57600080fd5b81019080803590602001909291905050506103dc565b604051808215151515815260200191505060405180910390f35b3480156101bb57600080fd5b506101c461041e565b005b3480156101d257600080fd5b5061021f600480360360408110156101e957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610756565b6040518082815260200191505060405180910390f35b61023d6107af565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390f35b34801561029257600080fd5b5061029b610810565b6040518082815260200191505060405180910390f35b6000806000836040516102c390610818565b80828152602001915050604051809103906000f0801580156102e9573d6000803e3d6000fd5b5090508073ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f19350505050158015610332573d6000803e3d6000fd5b508073ffffffffffffffffffffffffffffffffffffffff167fa53ffc4fb91f5ca8287e168fc73db3b0b384a6ca275650f885a1740ef7a0bc1c346040518082815260200191505060405180910390a280348191509250925050915091565b600080600034846040516103a390610818565b808281526020019150506040518091039082f0801580156103c8573d6000803e3d6000fd5b509050905080348191509250925050915091565b60007f379340f64b65a8890c7ea4f6d86d2359beaf41080f36a7ea64b78a2c06eee3f0826040518082815260200191505060405180910390a160019050919050565b7fe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b8556002604051806000019050602060405180830381855afa158015610467573d6000803e3d6000fd5b5050506040513d602081101561047c57600080fd5b810190808051906020019092919050505014610500576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260148152602001807f7368613220646967657374206d69736d6174636800000000000000000000000081525060200191505060405180910390fd5b7f9c1185a5c5e9fc54612808977ee8f548b2258d310000000000000000000000006003604051806000019050602060405180830381855afa158015610549573d6000803e3d6000fd5b5050506040515160601b6bffffffffffffffffffffffff1916146105d5576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260168152602001807f726d6431363020646967657374206d69736d617463680000000000000000000081525060200191505060405180910390fd5b60006001601b6040516000815260200160405260405180807f11111111111111111111111111111111111111111111111111111111111111118152506020018260ff168152602001807fb9f0bb08640d3c1c00761cdd0121209268f6fd3816bc98b9e6f3cc77bf82b698815250602001807f12ac7a61788a0fdc0e19180f14c945a8e1088a27d92a74dce81c0981fb6447448152506020019150506020604051602081039080840390855afa158015610692573d6000803e3d6000fd5b505050602060405103519050731563915e194d8cfba1943570603f7606a311550873ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610753576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f65637265636f766572206d69736d61746368000000000000000000000000000081525060200191505060405180910390fd5b50565b60008273ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f1935050505015801561079e573d6000803e3d6000fd5b506107a7610810565b905092915050565b6000803373ffffffffffffffffffffffffffffffffffffffff166108fc600234816107d657fe5b049081150290604051600060405180830381858888f19350505050158015610802573d6000803e3d6000fd5b503334819150915091509091565b600047905090565b61022d806108268339019056fe6080604052600660005560405161022d38038061022d8339818101604052602081101561002b57600080fd5b810190808051906020019092919050505080600081905550506101da806100536000396000f3fe60806040526004361061003f5760003560e01c80632ccb1b301461004157806339c117a4146100b0578063b69ef8a8146100df578063e6a899b61461010a575b005b34801561004d57600080fd5b5061009a6004803603604081101561006457600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610135565b6040518082815260200191505060405180910390f35b3480156100bc57600080fd5b506100c561018e565b604051808215151515815260200191505060405180910390f35b3480156100eb57600080fd5b506100f4610197565b6040518082815260200191505060405180910390f35b34801561011657600080fd5b5061011f61019f565b6040518082815260200191505060405180910390f35b60008273ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f1935050505015801561017d573d6000803e3d6000fd5b50610186610197565b905092915050565b60006001905090565b600047905090565b6000548156fea265627a7a72315820f6f44f505670bac22a9333cd975c317fbaa88dc23152a224b1341fc02dd8764264736f6c63430005100032a265627a7a723158205890404b6d6a9f080f4d5156523ec567b299609c5d3e45e4baf5c0ee35c7a68764736f6c63430005100032
60606040526010600155600154600a0a6002556201518060035566038d7ea4c6800060085560006009556046600a55336000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506119d28061007d6000396000f3006060604052600436106100d0576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630ce90ec2146100d557806317a7f4cc146100ed5780632052465e146101195780633ccfd60b1461021d5780634412e10414610232578063528b7b8f146102c05780635f4623f1146103235780635faf28801461035c5780637bff0a01146103885780638da5cb5b146103e5578063c39cbef11461043a578063ccf670f814610471578063e1fa763814610494578063f2fde38b146104c0575b600080fd5b6100eb60048080359060200190919050506104f9565b005b34156100f857600080fd5b6101176004808035906020019091908035906020019091905050610565565b005b341561012457600080fd5b61013a60048080359060200190919050506106d2565b60405180806020018781526020018663ffffffff1663ffffffff1681526020018563ffffffff1663ffffffff1681526020018461ffff1661ffff1681526020018361ffff1661ffff1681526020018281038252888181546001816001161561010002031660029004815260200191508054600181600116156101000203166002900480156102095780601f106101de57610100808354040283529160200191610209565b820191906000526020600020905b8154815290600101906020018083116101ec57829003601f168201915b505097505050505050505060405180910390f35b341561022857600080fd5b610230610758565b005b341561023d57600080fd5b610269600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061082d565b6040518080602001828103825283818151815260200191508051906020019060200280838360005b838110156102ac578082015181840152602081019050610291565b505050509050019250505060405180910390f35b34156102cb57600080fd5b6102e1600480803590602001909190505061095b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561032e57600080fd5b61035a600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190505061098e565b005b341561036757600080fd5b6103866004808035906020019091908035906020019091905050610a2d565b005b341561039357600080fd5b6103e3600480803590602001908201803590602001908080601f01602080910402602001604051908101604052809392919081815260200183838082843782019150505050505091905050610b0f565b005b34156103f057600080fd5b6103f8610b88565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561044557600080fd5b61046f60048080359060200190919080359060200190820180359060200191909192905050610bad565b005b341561047c57600080fd5b6104926004808035906020019091905050610c9b565b005b341561049f57600080fd5b6104be6004808035906020019091908035906020019091905050610d00565b005b34156104cb57600080fd5b6104f7600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610f93565b005b6008543414151561050957600080fd5b60048181548110151561051857fe5b9060005260206000209060030201600201600081819054906101000a900463ffffffff168092919060010191906101000a81548163ffffffff021916908363ffffffff1602179055505050565b6000600760009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663e98b7f4d83600060405161014001526040518263ffffffff167c01000000000000000000000000000000000000000000000000000000000281526004018082815260200191505061014060405180830381600087803b151561060257600080fd5b6102c65a03f1151561061357600080fd5b50505060405180519060200180519060200180519060200180519060200180519060200180519060200180519060200180519060200180519060200180519050909192939495969798509091929394959697509091929394959650909192939495509091929394509091929350909192509091509050809150506106cd83826040805190810160405280600581526020017f6b697474790000000000000000000000000000000000000000000000000000008152506110e8565b505050565b6004818154811015156106e157fe5b906000526020600020906003020160009150905080600001908060010154908060020160009054906101000a900463ffffffff16908060020160049054906101000a900463ffffffff16908060020160089054906101000a900461ffff169080600201600a9054906101000a900461ffff16905086565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156107b357600080fd5b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166108fc3073ffffffffffffffffffffffffffffffffffffffff16319081150290604051600060405180830381858888f19350505050151561082b57600080fd5b565b610835611764565b61083d611764565b600080600660008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205460405180591061088d5750595b9080825280602002602001820160405250925060009150600090505b600480549050811015610950578473ffffffffffffffffffffffffffffffffffffffff166005600083815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614156109435780838381518110151561092c57fe5b906020019060200201818152505081806001019250505b80806001019150506108a9565b829350505050919050565b60056020528060005260406000206000915054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161415156109e957600080fd5b80600760006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60148281600482815481101515610a4057fe5b906000526020600020906003020160020160009054906101000a900463ffffffff1663ffffffff1610151515610a7557600080fd5b836005600082815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610ae357600080fd5b83600486815481101515610af357fe5b9060005260206000209060030201600101819055505050505050565b600080600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054141515610b5e57600080fd5b610b67826112bd565b9050606481811515610b7557fe5b0681039050610b84828261133f565b5050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60028381600482815481101515610bc057fe5b906000526020600020906003020160020160009054906101000a900463ffffffff1663ffffffff1610151515610bf557600080fd5b846005600082815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610c6357600080fd5b8484600488815481101515610c7457fe5b90600052602060002090600302016000019190610c92929190611778565b50505050505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610cf657600080fd5b8060088190555050565b6000806000846005600082815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610d7357600080fd5b600486815481101515610d8257fe5b90600052602060002090600302019350600485815481101515610da157fe5b90600052602060002090600302019250610dbb606461160e565b9150600a5482111515610ef157610df260018560020160089054906101000a900461ffff1661ffff166116a590919063ffffffff16565b8460020160086101000a81548161ffff021916908361ffff160217905550610e3e60018560020160009054906101000a900463ffffffff1663ffffffff166116cb90919063ffffffff16565b8460020160006101000a81548163ffffffff021916908363ffffffff160217905550610e8a600184600201600a9054906101000a900461ffff1661ffff166116a590919063ffffffff16565b83600201600a6101000a81548161ffff021916908361ffff160217905550610eec8684600101546040805190810160405280600681526020017f7a6f6d62696500000000000000000000000000000000000000000000000000008152506110e8565b610f8b565b610f1b600185600201600a9054906101000a900461ffff1661ffff166116a590919063ffffffff16565b84600201600a6101000a81548161ffff021916908361ffff160217905550610f6360018460020160089054906101000a900461ffff1661ffff166116a590919063ffffffff16565b8360020160086101000a81548161ffff021916908361ffff160217905550610f8a846116f5565b5b505050505050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16141515610fee57600080fd5b600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161415151561102a57600080fd5b8073ffffffffffffffffffffffffffffffffffffffff166000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e060405160405180910390a3806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600080846005600082815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561115957600080fd5b60048681548110151561116857fe5b906000526020600020906003020192506111818361171f565b151561118c57600080fd5b6002548581151561119957fe5b0694506002858460010154018115156111ae57fe5b04915060405180807f6b697474790000000000000000000000000000000000000000000000000000008152506005019050604051809103902060001916846040518082805190602001908083835b60208310151561122157805182526020820191506020810190506020830392506111fc565b6001836020036101000a038019825116818451168082178552505050505050905001915050604051809103902060001916141561126d57606360648381151561126657fe5b0683030191505b6112ac6040805190810160405280600681526020017f4e6f4e616d6500000000000000000000000000000000000000000000000000008152508361133f565b6112b5836116f5565b505050505050565b600080826040518082805190602001908083835b6020831015156112f657805182526020820191506020810190506020830392506112d1565b6001836020036101000a03801982511681845116808217855250505050505090500191505060405180910390206001900490506002548181151561133657fe5b06915050919050565b600060016004805480600101828161135791906117f8565b9160005260206000209060030201600060c060405190810160405280888152602001878152602001600163ffffffff168152602001600354420163ffffffff168152602001600061ffff168152602001600061ffff16815250909190915060008201518160000190805190602001906113d192919061182a565b506020820151816001015560408201518160020160006101000a81548163ffffffff021916908363ffffffff16021790555060608201518160020160046101000a81548163ffffffff021916908363ffffffff16021790555060808201518160020160086101000a81548161ffff021916908361ffff16021790555060a082015181600201600a6101000a81548161ffff021916908361ffff1602179055505050039050336005600083815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555061151a6001600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461174690919063ffffffff16565b600660003373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055507f88f026aacbbecc90c18411df4b1185fd8d9be2470f1962f192bf84a27d0704b78184846040518084815260200180602001838152602001828103825284818151815260200191508051906020019080838360005b838110156115cd5780820151818401526020810190506115b2565b50505050905090810190601f1680156115fa5780820380516001836020036101000a031916815260200191505b5094505050505060405180910390a1505050565b6000611626600160095461174690919063ffffffff16565b600981905550814233600954604051808481526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401828152602001935050505060405180910390206001900481151561169d57fe5b069050919050565b60008082840190508361ffff168161ffff16101515156116c157fe5b8091505092915050565b60008082840190508363ffffffff168163ffffffff16101515156116eb57fe5b8091505092915050565b60035442018160020160046101000a81548163ffffffff021916908363ffffffff16021790555050565b6000428260020160049054906101000a900463ffffffff1663ffffffff1611159050919050565b600080828401905083811015151561175a57fe5b8091505092915050565b602060405190810160405280600081525090565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f106117b957803560ff19168380011785556117e7565b828001600101855582156117e7579182015b828111156117e65782358255916020019190600101906117cb565b5b5090506117f491906118aa565b5090565b8154818355818115116118255760030281600302836000526020600020918201910161182491906118cf565b5b505050565b828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061186b57805160ff1916838001178555611899565b82800160010185558215611899579182015b8281111561189857825182559160200191906001019061187d565b5b5090506118a691906118aa565b5090565b6118cc91905b808211156118c85760008160009055506001016118b0565b5090565b90565b61195b91905b8082111561195757600080820160006118ee919061195e565b60018201600090556002820160006101000a81549063ffffffff02191690556002820160046101000a81549063ffffffff02191690556002820160086101000a81549061ffff021916905560028201600a6101000a81549061ffff0219169055506003016118d5565b5090565b90565b50805460018160011615610100020316600290046000825580601f1061198457506119a3565b601f0160209004906000526020600020908101906119a291906118aa565b5b505600a165627a7a72305820132b51da42f560f7184ac5aae47f26c9658881610ed4c49b0c5c00f7456864e60029

0 comments on commit f5429cb

Please sign in to comment.