More method renaming and dead code removal

dist/pigeon.rb

@@ -137,8 +137,8 @@ end
 require_relative File.join("pigeon", "local_identity.rb")
 require_relative File.join("pigeon", "remote_identity.rb")
 require_relative File.join("pigeon", "storage.rb")
-require_relative File.join("pigeon", "draft_serializer.rb")
 require_relative File.join("pigeon", "message_serializer.rb")
+require_relative File.join("pigeon", "draft_serializer.rb")
 require_relative File.join("pigeon", "message.rb")
 require_relative File.join("pigeon", "draft.rb")
 require_relative File.join("pigeon", "lexer.rb")

dist/pigeon/draft.rb

@@ -74,9 +74,7 @@ module Pigeon
       message
     end
 
-    def render
-      puts "Rename to `render_as_draft` to avoid confusion."
-      puts "Do we even need DraftSerializer any more?"
+    def render_as_draft
       DraftSerializer.new(self).render
     end
 

dist/pigeon/draft_serializer.rb

@@ -3,13 +3,7 @@ require "erb"
 module Pigeon
   # Wrapper around a Pigeon::Draft to perform string templating.
   # Renders a string that contains most (but not all) of a Pigeon message.
-  class DraftSerializer
-    attr_reader :message
-
-    def initialize(message)
-      @message = message
-    end
-
+  class DraftSerializer < MessageSerializer
     def render
       body = message.body
       kind = message.kind

dist/pigeon/storage.rb

@@ -25,10 +25,6 @@ module Pigeon
       read { store[COUNT_INDEX_NS][mhash] || 0 }
     end
 
-    def message_count
-      read { store[MESG_NS].count }
-    end
-
     def save_message(msg)
       write do
         return msg if store[MESG_NS][msg.multihash]

spec/pigeon/draft_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe Pigeon::Draft do
 
   it "renders a message" do
     pk = Pigeon::LocalIdentity.current.multihash
-    actual = message.render
+    actual = message.render_as_draft
     expected = MSG.gsub("___", pk)
     expect(actual).to start_with(expected)
   end