Merge MessageHdr into Message and make Ipv6Address a BasePrimitive
The former makes setting payload_length sensibly much easier, with no drawbacks that I can see, while the latter lets us override assign to make comparisons between instances sane. All good.
This commit is contained in:
Nick Thomas
@@ -6,58 +6,50 @@ require 'btc_wire_proto'
|
||||
include ::BtcWireProto
|
||||
|
||||
describe Ipv6Address do
|
||||
describe "set" do
|
||||
before(:each) { @ip = Ipv6Address.new }
|
||||
|
||||
it "should parse IPv4 strings into IPAddress::IPv6::Mapped objects" do
|
||||
@ip.set("127.0.0.1")
|
||||
@ip.get.should be_a(IPAddress::IPv6::Mapped)
|
||||
@ip.get.to_s.should == "::ffff:127.0.0.1"
|
||||
end
|
||||
it "should read IPv6 strings into IPv6 addresses" do
|
||||
ex_obj = IPAddress("fea1:fea1:fea1:fea1:fea1:fea1:fea1:fea1")
|
||||
ex = ex_obj.data
|
||||
|
||||
it "should parse IPv6 strings into IPAddress::IPv6 objects" do
|
||||
@ip.set("fe80::1")
|
||||
@ip.get.should be_a(IPAddress::IPv6)
|
||||
@ip.get.to_s.should == "fe80::1"
|
||||
end
|
||||
|
||||
it "should accept IPAddress::IPv(4|6) objects" do
|
||||
@ip.set(IPAddress("127.0.0.1"))
|
||||
@ip.get.should be_a(IPAddress::IPv6::Mapped)
|
||||
@ip.get.to_s.should == "::ffff:127.0.0.1"
|
||||
|
||||
@ip.set(IPAddress("fe80::1"))
|
||||
@ip.get.should be_a(IPAddress::IPv6)
|
||||
@ip.get.to_s.should == "fe80::1"
|
||||
end
|
||||
ip = Ipv6Address::read(ex)
|
||||
ip.should == ex_obj
|
||||
ip.to_binary_s.should == ex
|
||||
|
||||
it "should accept arbitrary objects with #to_u128" do
|
||||
o = Object.new
|
||||
class << o
|
||||
def to_u128 ; 666 ; end
|
||||
end
|
||||
ip = Ipv6Address.new(ex_obj)
|
||||
ip.to_binary_s.should == ex
|
||||
end
|
||||
|
||||
it "should read IPv4 strings into IPv6-mapped addresses" do
|
||||
ip = Ipv6Address.new("127.0.0.1")
|
||||
ip.should == IPAddress("::ffff:127.0.0.1")
|
||||
end
|
||||
|
||||
@ip.set(o)
|
||||
@ip.address.should == 666
|
||||
it "should read IPAddress objects into IPv6/mapped addresses" do
|
||||
ip = Ipv6Address.new(IPAddress("127.0.0.1"))
|
||||
ip.should == (ip_m = IPAddress("::ffff:127.0.0.1"))
|
||||
ip.to_binary_s.should == ip_m.data
|
||||
end
|
||||
|
||||
end
|
||||
it "should read arbitrary objects with #to_u128 into IPv6/mapped addresses" do
|
||||
o = Object.new
|
||||
class << o ; def to_u128 ; 0xffffffffffff ; end ; end
|
||||
ip = Ipv6Address.new(o)
|
||||
ip.should == IPAddress("::ffff:ffff:ffff")
|
||||
end
|
||||
|
||||
it "should read Fixnums and Bignums into IPv6/mapped addresses" do
|
||||
ipv4 = IPAddress("127.0.0.1") # Should still be mapped
|
||||
ipv6 = IPAddress("fe80::1")
|
||||
|
||||
it "should treat Fixnums and Bignums as decimal IPs" do
|
||||
ipv4 = IPAddress("127.0.0.1") # Should still be mapped
|
||||
ipv6 = IPAddress("fe80::1")
|
||||
|
||||
@ip.set(ipv4.to_u32)
|
||||
@ip.get.should be_a(IPAddress::IPv6::Mapped)
|
||||
@ip.get.to_s.should == "::ffff:127.0.0.1"
|
||||
|
||||
@ip.set(ipv6.to_u128)
|
||||
@ip.get.should be_a(IPAddress::IPv6)
|
||||
@ip.get.to_s.should == "fe80::1"
|
||||
end
|
||||
ip = Ipv6Address.new(ipv4.to_u32)
|
||||
ip.should == IPAddress("::ffff:127.0.0.1")
|
||||
|
||||
ip = Ipv6Address.new(ipv6.to_u128)
|
||||
ip.should == ipv6
|
||||
end
|
||||
|
||||
it "should raise an ArgumentError when it can't parse objects" do
|
||||
lambda { @ip.set("bad IP") }.should raise_error(ArgumentError)
|
||||
end
|
||||
it "should raise ArgumentError for unparseable objects" do
|
||||
lambda { Ipv6Address.new("bad IP") }.should raise_error(ArgumentError)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -281,34 +273,36 @@ describe ::BtcWireProto do
|
||||
|
||||
|
||||
# Messages
|
||||
describe MessageHdr do
|
||||
end
|
||||
GOOD_VERSION_DATA = binary(%w{
|
||||
F9 BE B4 D9 76 65 72 73 69 6F 6E 00 00 00 00 00 55 00 00
|
||||
00 9C 7C 00 00 01 00 00 00 00 00 00 00 E6 15 10 4D 00 00
|
||||
00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
||||
00 FF FF 0A 00 00 01 DA F6 01 00 00 00 00 00 00 00 00 00
|
||||
00 00 00 00 00 00 00 00 FF FF 0A 00 00 02 20 8D DD 9D 20
|
||||
2C 3A B4 57 13 00 55 81 01 00
|
||||
})
|
||||
|
||||
SRV = { :node_network => 1 }
|
||||
|
||||
describe Message do
|
||||
context "Version message" do
|
||||
it "should have a Version payload" do
|
||||
m = Message::new(:header => {:command => 'version'})
|
||||
m = Message::new(:command => 'version')
|
||||
m.payload.selection.should == "version"
|
||||
end
|
||||
|
||||
it "should have a :version command symbol" do
|
||||
m = Message::new(:header => {:command => 'version'})
|
||||
m = Message::new(:command => 'version')
|
||||
m.cmd_sym.should == :version
|
||||
end
|
||||
|
||||
it "should parse binary data correctly" do
|
||||
m = Message::read(binary(%w{
|
||||
F9 BE B4 D9 76 65 72 73 69 6F 6E 00 00 00 00 00 55 00 00
|
||||
00 9C 7C 00 00 01 00 00 00 00 00 00 00 E6 15 10 4D 00 00
|
||||
00 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
|
||||
00 FF FF 0A 00 00 01 DA F6 01 00 00 00 00 00 00 00 00 00
|
||||
00 00 00 00 00 00 00 00 FF FF 0A 00 00 02 20 8D DD 9D 20
|
||||
2C 3A B4 57 13 00 55 81 01 00
|
||||
}))
|
||||
m.header.magic.should == BtcWireProto::NETWORKS[:main]
|
||||
m.header.command.should == "version\x00\x00\x00\x00\x00"
|
||||
m.header.payload_len.should == 85
|
||||
m.header.has_parameter?(:checksum).should be_false
|
||||
m = Message::read(GOOD_VERSION_DATA)
|
||||
|
||||
m.magic.should == BtcWireProto::NETWORKS[:main]
|
||||
m.command.should == "version\x00\x00\x00\x00\x00"
|
||||
m.payload_len.should == 85
|
||||
m.has_parameter?(:checksum).should be_false
|
||||
m.payload.version.should == 31900
|
||||
m.payload.services.node_network.should == 1
|
||||
m.payload.timestamp.should == 1292899814
|
||||
@@ -317,29 +311,50 @@ describe ::BtcWireProto do
|
||||
m.payload.nonce.should == 0x1357B43A2C209DDD
|
||||
m.payload.sub_version.should == ""
|
||||
m.payload.start_height.should == 98645
|
||||
|
||||
m.to_binary_s.should == GOOD_VERSION_DATA
|
||||
end
|
||||
|
||||
it "should generate binary data correctly" do
|
||||
m = Message::read(GOOD_VERSION_DATA)
|
||||
ex = Message::new(
|
||||
:magic => BtcWireProto::NETWORKS[:main], :command => 'version',
|
||||
:payload => {
|
||||
:version => 31900, :services => {:node_network => 1},
|
||||
:timestamp => 1292899814, :nonce => 0x1357B43A2C209DDD,
|
||||
:sub_version => "", :start_height => 98645,
|
||||
:addr_me => { :services => SRV, :ip => "10.0.0.1", :port => 56054 },
|
||||
:addr_you => { :services => SRV, :ip => "10.0.0.2", :port => 8333 }
|
||||
}
|
||||
)
|
||||
m.should == ex
|
||||
ex.to_binary_s.should == GOOD_VERSION_DATA
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
GOOD_VERACK_DATA = binary(%w{
|
||||
F9 BE B4 D9 76 65 72 61 63 6B 00 00 00 00 00 00 00 00 00 00
|
||||
})
|
||||
|
||||
context "Verack message" do
|
||||
|
||||
it "should have no payload" do
|
||||
m = Message.new(:header => {:command => "verack"})
|
||||
m = Message.new(:command => "verack")
|
||||
m.payload.selection.should == "null"
|
||||
end
|
||||
|
||||
it "should have a :verack command symbol" do
|
||||
m = Message.new(:header => {:command => "verack"})
|
||||
m = Message.new(:command => "verack")
|
||||
m.cmd_sym.should == :verack
|
||||
end
|
||||
|
||||
it "should parse the binary data correctly" do
|
||||
m = Message::read(binary(%w{
|
||||
F9 BE B4 D9 76 65 72 61 63 6B 00 00 00 00 00 00 00 00 00 00
|
||||
}))
|
||||
m.header.magic.should == BtcWireProto::NETWORKS[:main]
|
||||
m.header.command.should == "verack\x00\x00\x00\x00\x00\x00"
|
||||
m.header.payload_len.should == 0
|
||||
m.header.has_parameter?(:chcksum).should be_false
|
||||
m = Message::read(GOOD_VERACK_DATA)
|
||||
m.magic.should == BtcWireProto::NETWORKS[:main]
|
||||
m.command.should == "verack\x00\x00\x00\x00\x00\x00"
|
||||
m.payload_len.should == 0
|
||||
m.has_parameter?(:chcksum).should be_false
|
||||
m.to_binary_s.should == GOOD_VERACK_DATA
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user