merge in "Fix presence" - inactive code now active

Denver Gingerich created 

The unused `subscription(:request?) do |s|` section became used when
we switched Blather to stop processing a stanza on the first matched
Ruby proc in 6d19b7f.  It was added way back in the first week of
sgx-catapult development and hadn't been touched (or likely thought
of) since.  So it's about time we deleted it anyway.

This does cause subscription requests to work again in my testing.

See merge request !13 for the discussion and details behind the merge.

Change summary

sgx-catapult.rb | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

Detailed changes

sgx-catapult.rb 🔗 

@@ -313,7 +313,7 @@ module SGXcatapult
 		@gateway_features.uniq!
 	end
 
-	presence :subscribe? do |p|
+	subscription :request? do |p|
 		puts "PRESENCE1: #{p.inspect}"
 
 		# subscriptions are allowed from anyone - send reply immediately
@@ -804,12 +804,6 @@ module SGXcatapult
 		}.catch(&method(:panic))
 	end
 
-	subscription(:request?) do |s|
-		# TODO: are these the best to return?  really need '!' here?
-		#write_to_stream s.approve!
-		#write_to_stream s.request!
-	end
-
 	iq :get? do |i|
 		write_to_stream error_msg(i.reply, i.children, 'cancel', 'feature-not-implemented')
 	end