Simplify Echidna.ABI #545
Merged
Simplify Echidna.ABI #545
Conversation
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
incertia
reviewed
Nov 10, 2020
| genAbiCallM abi = genWithDict (fmap toList . view wholeCalls) (traverse $ traverse genAbiValueM) abi >>= mutateAbiCall | ||
| genAbiCallM :: MonadRandom m => GenDict -> SolSignature -> m SolCall | ||
| genAbiCallM genDict abi = | ||
| genWithDict |
There was a problem hiding this comment.
if we are to make this multiline can we use do
| @@ -159,7 +156,7 @@ getRandomUint n = join $ R.fromList [(getRandomR (0, 1023), 1), (getRandomR (0, | |||
| -- Note that we define the dictionary case ('genAbiValueM') first (below), so recursive types can be | |||
| -- be generated using the same dictionary easily | |||
| genAbiValue :: MonadRandom m => AbiType -> m AbiValue | |||
| genAbiValue = flip runReaderT defaultDict . genAbiValueM | |||
| genAbiValue = genAbiValueM defaultDict | |||
There was a problem hiding this comment.
we could always just give explicit parameters here to avoid runReaderT
genAbiValue t = genAbiValueM t defaultDict| dictValues :: GenDict -> [Integer] | ||
| dictValues g = catMaybes $ concatMap (\(_,h) -> map fromValue $ H.toList h) $ M.toList $ g ^. constants | ||
| dictValues :: GenDict -> [Integer] | ||
| dictValues g = catMaybes $ concatMap (\(_,h) -> map fromValue $ H.toList h) $ M.toList $ _constants g |
There was a problem hiding this comment.
i would try to use lens wherever possible to promote usage and keep things consistent
| fromMaybe <$> g t <*> (bool (pure Nothing) (fromDict c) . (c ^. pSynthA >=) =<< getRandom) | ||
| genWithDict :: (Eq a, Hashable a, MonadRandom m) | ||
| => GenDict -> HashMap a [b] -> (a -> m b) -> a -> m b | ||
| genWithDict genDict f g t = do |
There was a problem hiding this comment.
we should rename the f parameter here because its meaning has changed and is no longer a function
| => GenDict -> HashMap a [b] -> (a -> m b) -> a -> m b | ||
| genWithDict genDict f g t = do | ||
| let fromDict = uniformMay (M.lookupDefault [] t f) | ||
| fromMaybe <$> g t <*> (bool (pure Nothing) fromDict . (_pSynthA genDict >=) =<< getRandom) |
There was a problem hiding this comment.
if we want to target #545 this is a good line to target
do
r <- getRandom
fromMaybe <$> g t <*> bool (pure Nothing) fromDict (genDict ^. pSynthA >= r)| genAbiValueM :: (MonadReader x m, Has GenDict x, MonadRandom m) => AbiType -> m AbiValue | ||
| genAbiValueM = genWithDict (fmap toList . view constants) $ \case | ||
| genAbiValueM :: MonadRandom m => GenDict -> AbiType -> m AbiValue | ||
| genAbiValueM genDict = genWithDict genDict (toList <$> _constants genDict) $ \case |
There was a problem hiding this comment.
this is why i want to avoid removing MonadReader from things. we now have to pass this around everywhere
| >>= flip V.replicateM (genAbiValueM t) | ||
| (AbiArrayType n t) -> AbiArray n t <$> V.replicateM n (genAbiValueM t) | ||
| (AbiTupleType v) -> AbiTuple <$> traverse genAbiValueM v | ||
| >>= flip V.replicateM (genAbiValueM genDict t) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No semantic changes. Replacing MonadReader with an explicit argument and some lens with bare accessors. This effort is towards #487