revert changes

Author: MariusVanDerWijden

build/ci.go

@@ -251,7 +251,7 @@ func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (
 	if runtime.GOOS == "linux" {
 		// Enforce the stacksize to 8M, which is the case on most platforms apart from
 		// alpine Linux.
-		extld := []string{"-Wl,-z,stack-size=0x800000,--build-id=none,--strip-all"}
+		extld := []string{"-Wl,-z,stack-size=0x800000"}
 		if staticLinking {
 			extld = append(extld, "-static")
 			// Under static linking, use of certain glibc features must be

core/blockchain.go

@@ -556,7 +556,6 @@ func (bc *BlockChain) loadLastState() error {
 	if pivot := rawdb.ReadLastPivotNumber(bc.db); pivot != nil {
 		log.Info("Loaded last snap-sync pivot marker", "number", *pivot)
 	}
-
 	return nil
 }
 

rpc/client_test.go

@@ -37,70 +37,6 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
-// unsubscribeBlocker will wait for the quit channel to process an unsubscribe
-// request.
-type unsubscribeBlocker struct {
-	ServerCodec
-	quit chan struct{}
-}
-
-func (b *unsubscribeBlocker) readBatch() ([]*jsonrpcMessage, bool, error) {
-	msgs, batch, err := b.ServerCodec.readBatch()
-	for _, msg := range msgs {
-		if msg.isUnsubscribe() {
-			<-b.quit
-		}
-	}
-	return msgs, batch, err
-}
-
-// TestUnsubscribeTimeout verifies that calling the client's Unsubscribe
-// function will eventually timeout and not block forever in case the serve does
-// not respond.
-// It reproducers the issue https://github.com/ethereum/go-ethereum/issues/30156
-func TestUnsubscribeTimeout(t *testing.T) {
-	srv := NewServer()
-	srv.RegisterName("nftest", new(notificationTestService))
-
-	// Setup middleware to block on unsubscribe.
-	p1, p2 := net.Pipe()
-	blocker := &unsubscribeBlocker{ServerCodec: NewCodec(p1), quit: make(chan struct{})}
-	defer close(blocker.quit)
-
-	// Serve the middleware.
-	go srv.ServeCodec(blocker, OptionMethodInvocation|OptionSubscriptions)
-	defer srv.Stop()
-
-	// Create the client on the other end of the pipe.
-	cfg := new(clientConfig)
-	client, _ := newClient(context.Background(), cfg, func(context.Context) (ServerCodec, error) {
-		return NewCodec(p2), nil
-	})
-	defer client.Close()
-
-	// Start subscription.
-	sub, err := client.Subscribe(context.Background(), "nftest", make(chan int), "someSubscription", 1, 1)
-	if err != nil {
-		t.Fatalf("failed to subscribe: %v", err)
-	}
-
-	// Now on a separate thread, attempt to unsubscribe. Since the middleware
-	// won't return, the function will only return if it times out on the request.
-	done := make(chan struct{})
-	go func() {
-		sub.Unsubscribe()
-		done <- struct{}{}
-	}()
-
-	// Wait for the timeout. If the expected time for the timeout elapses, the
-	// test is considered failed.
-	select {
-	case <-done:
-	case <-time.After(10*time.Second + 50*time.Millisecond):
-		t.Fatalf("Unsubscribe did not return within %s", "10")
-	}
-}
-
 func TestClientRequest(t *testing.T) {
 	server := newTestServer()
 	defer server.Stop()