Closed alexhernandezgarcia closed 9 months ago
@carriepl I would like to have your advice on how to proceed with this PR. The situation is the following:
main
before main
included the crystal's updates.main
, then main
will be broken, until the changes updating the crystal's environments are applied.I am thinking that an auxiliary branch off main
would do, but I wonder if there is any other better way.
@carriepl I would like to have your advice on how to proceed with this PR. The situation is the following:
- This branch was off
main
beforemain
included the crystal's updates.- Therefore, this PR does not update the crystal's environments.
- Therefore, if it is merged to
main
, thenmain
will be broken, until the changes updating the crystal's environments are applied.I am thinking that an auxiliary branch off
main
would do, but I wonder if there is any other better way.
Is there any obstacle to rebasing this branch (or a copy of this branch, to be safer) over the main and then updating the crystal environments in the rebased version of this branch?
@carriepl I would like to have your advice on how to proceed with this PR. The situation is the following:
- This branch was off
main
beforemain
included the crystal's updates.- Therefore, this PR does not update the crystal's environments.
- Therefore, if it is merged to
main
, thenmain
will be broken, until the changes updating the crystal's environments are applied.I am thinking that an auxiliary branch off
main
would do, but I wonder if there is any other better way.Is there any obstacle to rebasing this branch (or a copy of this branch, to be safer) over the main and then updating the crystal environments in the rebased version of this branch?
That's about what I thought you could say. The only obstacle is that I don't feel super at ease with rebasing yet. Would you mind outlining what the steps should be?
@carriepl I would like to have your advice on how to proceed with this PR. The situation is the following:
- This branch was off
main
beforemain
included the crystal's updates.- Therefore, this PR does not update the crystal's environments.
- Therefore, if it is merged to
main
, thenmain
will be broken, until the changes updating the crystal's environments are applied.I am thinking that an auxiliary branch off
main
would do, but I wonder if there is any other better way.Is there any obstacle to rebasing this branch (or a copy of this branch, to be safer) over the main and then updating the crystal environments in the rebased version of this branch?
That's about what I thought you could say. The only obstacle is that I don't feel super at ease with rebasing yet. Would you mind outlining what the steps should be?
OK one thing you could do is merge locally main -> conversion-simplify
(from this branch on your machine, do git pull origin main
), then after you've merged everything locally and committed those changes to the conversion-simplify
branch, push them to conversion-simplify
on github, and then finally complete the pull request here. There will no longer be merge conflicts with main
.
I agree that rebasing will work but it's also confusing.
To save yourself heartache, make a zip archive of your local repo before you do the git pull
in case the resulting merge conflicts are too confusing. I'm trying it now on my machine and it does not seem too bad, but I'm not familiar enough with the code to whip off the merge quickly without some research.
So I am doing this the way it is easiest and safest to me.
conversions-simplify-merge
).conversions-simplify
into conversions-simplify-merge
(copy of main
)conversions-simplify-merge
and merge into main
in a new PR (to be done).
This PR simplifies state conversions in the following ways:
state*2oracle
has been removed as well as other mentions tooracle
. In short, references to the oracle are now unified into references to the proxy.statebatch2proxy
andstatetorch2proxy
are now unified bystates2proxy
statebatch2policy
andstatetorch2policy
are now unified bystates2policy
state2proxy
has been removed from all environments because it is enough with the implementation in the base environment, which callsstates2proxy
.policy2state
has been removed.I have also taken the chance to add richer docstrings. I believe all other changes should be related to the above.
Note: the PR includes some deletion of files, which come from a different branch because I messed up things somehow... :sweat: Sorry for that!