vendor: eliminate some of the `replace` directives

[errordeveloper]

First follow-up to https://github.com/docker/swarmkit/pull/3046#issuecomment-989982399

[codecov[bot]]

Codecov Report

Merging #3048 (4b579ac) into master (234cb83) will increase coverage by 0.14%. The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3048      +/-   ##
==========================================
+ Coverage   62.14%   62.29%   +0.14%     
==========================================
  Files         155      155              
  Lines       24533    24533              
==========================================
+ Hits        15247    15282      +35     
+ Misses       7682     7651      -31     
+ Partials     1604     1600       -4     

[errordeveloper]

--- FAIL: TestRaftQuorumRecovery (10.55s)
    testutils.go:97: 
        	Error Trace:	testutils.go:97
        	            				raft_test.go:343
        	Error:      	Received unexpected error:
        	            	did not find a ready leader in member list
        	            	github.com/docker/swarmkit/manager/state/raft/testutils.WaitForCluster.func1
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/manager/state/raft/testutils/testutils.go:74
        	            	github.com/docker/swarmkit/testutils.PollFuncWithTimeout
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:22
        	            	github.com/docker/swarmkit/testutils.PollFunc
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:36
        	            	github.com/docker/swarmkit/manager/state/raft/testutils.WaitForCluster
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/manager/state/raft/testutils/testutils.go:60
        	            	github.com/docker/swarmkit/manager/state/raft_test.TestRaftQuorumRecovery
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/manager/state/raft/raft_test.go:343
        	            	testing.tRunner
        	            		/usr/local/go/src/testing/testing.go:1259
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1581
        	            	polling failed
        	            	github.com/docker/swarmkit/testutils.PollFuncWithTimeout
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:28
        	            	github.com/docker/swarmkit/testutils.PollFunc
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/testutils/poll.go:36
        	            	github.com/docker/swarmkit/manager/state/raft/testutils.WaitForCluster
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/manager/state/raft/testutils/testutils.go:60
        	            	github.com/docker/swarmkit/manager/state/raft_test.TestRaftQuorumRecovery
        	            		/home/circleci/.go_workspace/src/github.com/docker/swarmkit/manager/state/raft/raft_test.go:343
        	            	testing.tRunner
        	            		/usr/local/go/src/testing/testing.go:1259
        	            	runtime.goexit
        	            		/usr/local/go/src/runtime/asm_amd64.s:1581
        	Test:       	TestRaftQuorumRecovery
FAIL
coverage: 70.8% of statements
FAIL	github.com/docker/swarmkit/manager/state/raft	39.571s

Could this be an issue with upgraded deps or is it a flake? 🤔

[errordeveloper]

Could this be an issue with upgraded deps or is it a flake? 🤔

Ok, looks like a flake as it all tests passed on a previous commit.

[errordeveloper]

Great! Minor nit, also squash commits

thanks! this is still a draft ;)

[errordeveloper]

@thaJeztah I think we should merge this, when I update Moby I'll make sure to use 234cb83b741405586538ad8e41b5b48ca468ff4b in the first update.

[crazy-max]

@errordeveloper https://github.com/moby/moby/pull/43101 has been merged. I think we can move forward with this one.

[errordeveloper]

@thaJeztah thanks for the review!

[thaJeztah]

@dperny PTAL 🤗

[thaJeztah]

These have now all been removed in https://github.com/moby/swarmkit/pull/3094