summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_binary_generator.erl6
-rw-r--r--src/rabbit_tests.erl4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_binary_generator.erl b/src/rabbit_binary_generator.erl
index 6b6b395a6a..2ece86963f 100644
--- a/src/rabbit_binary_generator.erl
+++ b/src/rabbit_binary_generator.erl
@@ -215,9 +215,9 @@ encode_property(shortstr, String) ->
encode_property(longstr, String) -> Len = size(String),
<<Len:32, String:Len/binary>>;
encode_property(octet, Int) -> <<Int:8/unsigned>>;
-encode_property(shortint, Int) -> <<Int:16/unsigned>>;
-encode_property(longint, Int) -> <<Int:32/unsigned>>;
-encode_property(longlongint, Int) -> <<Int:64/unsigned>>;
+encode_property(short, Int) -> <<Int:16/unsigned>>;
+encode_property(long, Int) -> <<Int:32/unsigned>>;
+encode_property(longlong, Int) -> <<Int:64/unsigned>>;
encode_property(timestamp, Int) -> <<Int:64/unsigned>>;
encode_property(table, Table) -> table_to_binary(Table).
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index eb97f1d6ff..715aa186ec 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -444,10 +444,10 @@ test_content_properties() ->
test_content_prop_encoding([{bit, true}, {octet, 123}, {octet, 123}, {bit, true}],
<<16#F0,0,123,123>>),
test_content_prop_encoding([{bit, true}, {shortstr, <<"hi">>}, {bit, true},
- {shortint, 54321}, {bit, true}],
+ {short, 54321}, {bit, true}],
<<16#F8,0,2,"hi",16#D4,16#31>>),
test_content_prop_encoding([{bit, true}, {shortstr, undefined}, {bit, true},
- {shortint, 54321}, {bit, true}],
+ {short, 54321}, {bit, true}],
<<16#B8,0,16#D4,16#31>>),
test_content_prop_encoding([{table, [{<<"a signedint">>, signedint, 12345678},
{<<"a longstr">>, longstr, <<"yes please">>},