Remove DefaultMinimumPow patches in favor of using whisper config (#683)

_assets/patches/geth/0004-whisper-notifications.patch

@@ -961,15 +961,6 @@ index 7a57488bd..a6c9e610d 100644
  )
  
  const (
-@@ -57,7 +59,7 @@ const (
- 
- 	MaxMessageSize        = uint32(10 * 1024 * 1024) // maximum accepted size of a message.
- 	DefaultMaxMessageSize = uint32(1024 * 1024)
--	DefaultMinimumPoW     = 0.2
-+	DefaultMinimumPoW     = 0.001
- 
- 	padSizeLimit      = 256 // just an arbitrary number, could be changed without breaking the protocol (must not exceed 2^24)
- 	messageQueueLimit = 1024
 @@ -85,3 +87,15 @@ type MailServer interface {
  	Archive(env *Envelope)
  	DeliverMail(whisperPeer *Peer, request *Envelope)

_assets/patches/geth/0014-whisperv6-notifications.patch

@@ -32,15 +32,6 @@ index d5d7fed60..5ad660616 100644
  )
  
  // Whisper protocol parameters
-@@ -67,7 +69,7 @@ const (
- 
- 	MaxMessageSize        = uint32(10 * 1024 * 1024) // maximum accepted size of a message.
- 	DefaultMaxMessageSize = uint32(1024 * 1024)
--	DefaultMinimumPoW     = 0.2
-+	DefaultMinimumPoW     = 0.001
- 
- 	padSizeLimit      = 256 // just an arbitrary number, could be changed without breaking the protocol
- 	messageQueueLimit = 1024
 @@ -95,3 +97,15 @@ type MailServer interface {
  	Archive(env *Envelope)
  	DeliverMail(whisperPeer *Peer, request *Envelope)

geth/node/node.go

@@ -161,9 +161,13 @@ func activateShhService(stack *node.Node, config *params.NodeConfig) error {
 	}
 
 	serviceConstructor := func(*node.ServiceContext) (node.Service, error) {
-		whisperConfig := config.WhisperConfig
-		whisperService := whisper.New(nil)
+		whisperServiceConfig := &whisper.Config{
+			MaxMessageSize:     whisper.DefaultMaxMessageSize,
+			MinimumAcceptedPOW: 0.001,
+		}
+		whisperService := whisper.New(whisperServiceConfig)
 
+		whisperConfig := config.WhisperConfig
 		// enable metrics
 		whisperService.RegisterEnvelopeTracer(&shhmetrics.EnvelopeTracer{})
 

vendor/github.com/ethereum/go-ethereum/whisper/whisperv5/doc.go

@@ -59,7 +59,7 @@ const (
 
 	MaxMessageSize        = uint32(10 * 1024 * 1024) // maximum accepted size of a message.
 	DefaultMaxMessageSize = uint32(1024 * 1024)
-	DefaultMinimumPoW     = 0.001
+	DefaultMinimumPoW     = 0.2
 
 	padSizeLimit      = 256 // just an arbitrary number, could be changed without breaking the protocol (must not exceed 2^24)
 	messageQueueLimit = 1024

vendor/github.com/ethereum/go-ethereum/whisper/whisperv6/doc.go

@@ -69,7 +69,7 @@ const (
 
 	MaxMessageSize        = uint32(10 * 1024 * 1024) // maximum accepted size of a message.
 	DefaultMaxMessageSize = uint32(1024 * 1024)
-	DefaultMinimumPoW     = 0.001
+	DefaultMinimumPoW     = 0.2
 
 	padSizeLimit      = 256 // just an arbitrary number, could be changed without breaking the protocol
 	messageQueueLimit = 1024