Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fund all #1249

Merged
merged 10 commits into from
Mar 20, 2018
Merged

Fund all #1249

merged 10 commits into from
Mar 20, 2018

Conversation

wythe
Copy link
Collaborator

@wythe wythe commented Mar 19, 2018

This is a work in progress for #665.

I have the basic feature implemented. I want to remove redundant code and make testing more comprehensive. Also, there is a valgrind error in one of the tests.

return;
}
fc->change = 0;
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to set fc->change_keyindex = 0 too, to quiet valgrind.

@@ -271,7 +271,9 @@ int main(int argc, char *argv[])
add_input(&cmd, argv[i], i, argc);
tal_append_fmt(&cmd, "] }");
}

#if 0
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary change.

@@ -341,7 +343,6 @@ int main(int argc, char *argv[])
opt_free_table();
return 0;
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unnecessary change.

command_fail(cmd, "Could not parse id");
return;
}
fc->funding_satoshi = 0;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bad indentation.

return;
}
fc->change = 0;
} else {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indentation please.

}
fc->change = 0;
} else {
fc->utxomap = build_utxos(fc, cmd->ld, fc->funding_satoshi,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Insufficient indentation.

@cdecker
Copy link
Member

cdecker commented Mar 20, 2018

Please don't do merge commits, they tend to mess up the history.

@cdecker
Copy link
Member

cdecker commented Mar 20, 2018

Excellent work, this is starting to look very promising. In its current state I'd squash the PR into a single commit, but if you find it better to organize it into multiple commits feel free to split it according to those lines and git push -f it here.

Other than the random naming changes I'm happy with the PR as it currently is.

@wythe
Copy link
Collaborator Author

wythe commented Mar 20, 2018

I see now what that merge did to the history. What's the proper git way for me to squash this branch? Do I squash all the merged commits too?

Also, I'll back out the naming changes, that was me starting to try and unify withdraw and fundchannel.

@cdecker
Copy link
Member

cdecker commented Mar 20, 2018

@wythe no worries, I'll just squash the PR, since the only reasonable separation I can think of is to split out the integration test, but that's also a bit artificial.

@cdecker cdecker merged commit 489d8d0 into ElementsProject:master Mar 20, 2018
@cdecker
Copy link
Member

cdecker commented Mar 20, 2018

Congrats @wythe to your first commit to the c-lightning repository ⚡

@wythe
Copy link
Collaborator Author

wythe commented Mar 21, 2018

Great. Thanks for the help.

@wythe wythe deleted the fund_all branch March 21, 2018 15:22
@wythe wythe restored the fund_all branch March 23, 2018 14:35
@wythe wythe deleted the fund_all branch March 23, 2018 14:36
@wythe wythe restored the fund_all branch March 23, 2018 14:38
@wythe wythe deleted the fund_all branch March 23, 2018 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants