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

Sync upstream through July 22, 2015 #164

Merged
merged 9 commits into from
May 12, 2016

Conversation

davecgh
Copy link
Member

@davecgh davecgh commented May 11, 2016

No description provided.

dajohi and others added 9 commits May 11, 2016 12:27
When trickling inv's to peers, allocate for the number of inv's
in the queue instead of the default 1000.  This should save on
memory.
This commit corrects the JSON-RPC API doc return to overview links for
the Websocket Extension Method Details section.
This commit correctly replaces persistent peers that are being retried in
the list of persistent peers so it will continue to be retried as
intended.

Also, limit the maximum retry interval for persistent peers to 5 minutes.

Fixes btcsuite#463.
This mimics Bitcoin Core commit a1ba0778dd3c784046dea334e5d39f37eca264f7
At the current time, there is no difference between the wire encoding
at protocol version 0 and the stable long-term storage format.  These
methods are simply for consistency with the other types.
@davecgh davecgh changed the title Sync upstream through jul22 Sync upstream through July 22, 2015 May 11, 2016
@@ -216,14 +217,15 @@ func TestBlockHeaderWire(t *testing.T) {
continue
}

b, err := wire.TstBytesBlockHeader(test.in)
buf.Reset()
err = test.in.BtcEncode(&buf, pver)
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably drop BtcEncode at some point for something more generic... (ccEncode??) But not a consideration for current PR.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah that would make sense. I suspect MsgEncode/MsgDecode would make the most sense given it is part of the Message interface.

@cjepson
Copy link
Contributor

cjepson commented May 11, 2016

baef004: OK
ed9d194: OK
901fafc: OK
5f5bda7: OK
e75b1a6: utACK
4583290: utACK
a3ff9f1: tACK (tests only)

@jcvernaleo
Copy link
Member

Looks good to me.

@alexlyp
Copy link
Member

alexlyp commented May 12, 2016

tACK

@alexlyp alexlyp merged commit a3ff9f1 into decred:master May 12, 2016
@davecgh davecgh deleted the sync_upstream_through_jul22 branch May 12, 2016 21:52
@jcvernaleo jcvernaleo added this to the v0.1.4 milestone May 25, 2016
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.

None yet

7 participants