fixes mock generation and attempts to fix TestDaemon_PersistOffers (#303)

* fixes mock generation
* ensures mock generation is working in CI for future PRs
* attempts to fix TestDaemon_PersistOffers failures deleting its temporary data directory
* updates some library dependencies
This commit is contained in:
Dmitry Holodov
2023-02-09 07:53:14 -06:00
committed by GitHub
parent bb9a50dd7f
commit c5dacd1b59
10 changed files with 121 additions and 108 deletions

View File

@@ -30,6 +30,17 @@ jobs:
- name: Run linters
run: make lint
mockgen-check:
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v3
with:
go-version: '1.19.x'
- uses: actions/checkout@v3
- name: Generate mocks and verify no changes
run: make mock && diff -u <(echo -n) <(git status --short --untracked-files=no)
vet-check:
runs-on: ubuntu-22.04
steps:

View File

@@ -73,6 +73,7 @@ bindings:
.PHONY: mock
mock:
test -x $(GOPATH)/bin/mockgen || go install github.com/golang/mock/mockgen@v1.6.0
go generate -run mockgen ./...
$(MAKE) format-go

View File

@@ -11,9 +11,9 @@ import (
"time"
"github.com/cockroachdb/apd/v3"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
"golang.org/x/sys/unix"
"github.com/athanorlabs/atomic-swap/coins"
"github.com/athanorlabs/atomic-swap/common/types"
@@ -137,6 +137,12 @@ func TestDaemon_PersistOffers(t *testing.T) {
startupTimeout := time.Millisecond * 100
dataDir := t.TempDir()
defer func() {
// CI has issues with the filesystem still being written to when it is
// recursively deleting dataDir. Can't be replicated outside of CI.
unix.Sync()
time.Sleep(500 * time.Millisecond)
}()
wc := monero.CreateWalletClientWithWalletDir(t, dataDir)
one := apd.New(1, 0)
monero.MineMinXMRBalance(t, wc, coins.MoneroToPiconero(one))

29
go.mod
View File

@@ -6,16 +6,16 @@ require (
filippo.io/edwards25519 v1.0.0
github.com/ChainSafe/chaindb v0.1.5-0.20221010190531-f900218c88f8
github.com/MarinX/monerorpc v1.0.5
github.com/Masterminds/semver/v3 v3.1.1
github.com/athanorlabs/go-dleq v0.0.0-20221228030413-8ac300febf46
github.com/Masterminds/semver/v3 v3.2.0
github.com/athanorlabs/go-dleq v0.0.0-20230113214619-d6fd7c03e213
github.com/athanorlabs/go-p2p-net v0.0.0-20230126054330-40336771ef86
github.com/athanorlabs/go-relayer v0.0.6-0.20230126054526-85b34765dc00
github.com/athanorlabs/go-relayer-client v0.0.0-20221103041240-2aad2e8fc742
github.com/btcsuite/btcd/btcutil v1.1.2
github.com/btcsuite/btcd/btcutil v1.1.3
github.com/cockroachdb/apd/v3 v3.1.2
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0
github.com/ethereum/go-ethereum v1.10.26
github.com/fatih/color v1.13.0
github.com/fatih/color v1.14.1
github.com/golang/mock v1.6.0
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
@@ -24,15 +24,17 @@ require (
github.com/ipfs/go-log v1.0.5
github.com/libp2p/go-libp2p v0.24.2
github.com/stretchr/testify v1.8.1
github.com/urfave/cli/v2 v2.10.2
golang.org/x/crypto v0.4.0
github.com/urfave/cli/v2 v2.24.3
golang.org/x/crypto v0.5.0
golang.org/x/sys v0.5.0
)
require (
github.com/ChainSafe/log15 v1.0.0 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.1 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/cgroups v1.0.4 // indirect
@@ -98,8 +100,8 @@ require (
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/mattn/go-pointer v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.13 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -130,14 +132,14 @@ require (
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/raulk/go-watchdog v1.3.0 // indirect
github.com/rjeczalik/notify v0.9.2 // indirect
github.com/rjeczalik/notify v0.9.3 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
github.com/smartystreets/assertions v1.13.0 // indirect
github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/whyrusleeping/go-keyspace v0.0.0-20160322163242-5b898ac5add1 // indirect
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
@@ -149,9 +151,8 @@ require (
go.uber.org/zap v1.24.0 // indirect
golang.org/x/exp v0.0.0-20221205204356-47842c84f3db // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.4.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.3.0 // indirect
golang.org/x/tools v0.3.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect

69
go.sum
View File

@@ -50,8 +50,8 @@ github.com/ChainSafe/log15 v1.0.0/go.mod h1:5v1+ALHtdW0NfAeeoYyKmzCAMcAeqkdhIg4u
github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
github.com/MarinX/monerorpc v1.0.5 h1:3brpRWTLngzjlAGprmLWuAY16QCSiwokoaGdpu+/ukc=
github.com/MarinX/monerorpc v1.0.5/go.mod h1:NohAIf5kJ4pS0sO9mbEQkI1dLHuxd4L0DX2Zou0Yofo=
github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc=
github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
github.com/Masterminds/semver/v3 v3.2.0 h1:3MEsd0SM6jqZojhjLWWeBY+Kcjy9i6MQAeY7YgDP83g=
github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=
github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
@@ -63,8 +63,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/athanorlabs/go-dleq v0.0.0-20221228030413-8ac300febf46 h1:4N2dClTJzeozyzQxyA9Ioj9C2ZSWR9vFFiknKLXBaUU=
github.com/athanorlabs/go-dleq v0.0.0-20221228030413-8ac300febf46/go.mod h1:DWry6jSD7A13MKmeZA0AX3/xBeQCXDoygX99VPwL3yU=
github.com/athanorlabs/go-dleq v0.0.0-20230113214619-d6fd7c03e213 h1:2IaAtMG8GEi2A9YdG7swqHadOiyvrysgR1uSEMEQHHI=
github.com/athanorlabs/go-dleq v0.0.0-20230113214619-d6fd7c03e213/go.mod h1:DWry6jSD7A13MKmeZA0AX3/xBeQCXDoygX99VPwL3yU=
github.com/athanorlabs/go-p2p-net v0.0.0-20230126054330-40336771ef86 h1:4e3DZ0FIC5ukrVX6I6XXUsKIg5+LGHVDbNzsNL2fRRM=
github.com/athanorlabs/go-p2p-net v0.0.0-20230126054330-40336771ef86/go.mod h1:U++jd4bNvI6qMDysd0gLWVst4DtHDEYvnoQAk4n7cx4=
github.com/athanorlabs/go-relayer v0.0.6-0.20230126054526-85b34765dc00 h1:rR3ZzPqlGngBVGdcYfyUlvkC2lu/ydKfnzfPP616K3A=
@@ -81,19 +81,19 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
github.com/btcsuite/btcd v0.23.0 h1:V2/ZgjfDFIygAX3ZapeigkVBoVUtOJKSwrhZdlpSvaA=
github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
github.com/btcsuite/btcd/btcec/v2 v2.3.1 h1:v8tFffXRNpwFPbeQhkYPrOXOvVrwD5QIe66Jkz3db14=
github.com/btcsuite/btcd/btcec/v2 v2.3.1/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ=
github.com/btcsuite/btcd/btcutil v1.1.2/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2 h1:KdUfX2zKommPRa+PD0sWZUyXe9w277ABlgELO7H04IM=
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.2/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
@@ -176,8 +176,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w=
github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg=
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk=
github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
@@ -455,14 +455,13 @@ github.com/marten-seemann/webtransport-go v0.4.3 h1:vkt5o/Ci+luknRteWdYGYH1KcB7z
github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0=
github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc=
github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU=
@@ -590,8 +589,8 @@ github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtB
github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
github.com/rivo/uniseg v0.4.2 h1:YwD0ulJSJytLpiaWua0sBDusfsCZohxjxzVTYjwxfV8=
github.com/rjeczalik/notify v0.9.2 h1:MiTWrPj55mNDHEiIX5YUSKefw/+lCQVoAFmD6oQm5w8=
github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM=
github.com/rjeczalik/notify v0.9.3 h1:6rJAzHTGKXGj76sbRgDiDcYj/HniypXmSJo1SWakZeY=
github.com/rjeczalik/notify v0.9.3/go.mod h1:gF3zSOrafR9DQEWSE8TjfI9NkooDxbyT4UgRGKZA0lc=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
@@ -663,16 +662,15 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
github.com/tklauser/numcpus v0.5.0 h1:ooe7gN0fg6myJ0EKoTAf5hebTZrH52px3New/D9iJ+A=
github.com/tklauser/numcpus v0.5.0/go.mod h1:OGzpTxpcIMNGYQdit2BYL1pvk/dSOaJWjKoflh+RQjo=
github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
github.com/urfave/cli/v2 v2.24.3 h1:7Q1w8VN8yE0MJEHP06bv89PjYsN4IHWED2s1v/Zlfm0=
github.com/urfave/cli/v2 v2.24.3/go.mod h1:GHupkWPMM0M/sj1a2b4wUrWBPzazNrIjouW6fmdJLxc=
github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
github.com/warpfork/go-wish v0.0.0-20200122115046-b9ea61034e4a h1:G++j5e0OC488te356JvdhaM8YS6nMsjLAYF7JxCv07w=
@@ -730,8 +728,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
golang.org/x/crypto v0.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -813,8 +811,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -870,7 +868,6 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -899,16 +896,14 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -918,7 +913,7 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

View File

@@ -121,7 +121,7 @@ func newTestInstanceAndDBAndNet(t *testing.T) (*Instance, *offers.MockDatabase,
db.EXPECT().GetAllOffers()
db.EXPECT().DeleteOffer(gomock.Any()).Return(nil).AnyTimes()
host := NewMockP2pnetHost(ctrl)
host := NewMockP2pHost(ctrl)
cfg := &Config{
Backend: b,

View File

@@ -1,5 +1,5 @@
// Code generated by MockGen. DO NOT EDIT.
// Source: github.com/athanorlabs/atomic-swap/net (interfaces: P2pnetHost)
// Source: github.com/athanorlabs/atomic-swap/net (interfaces: P2pHost)
// Package xmrmaker is a generated GoMock package.
package xmrmaker
@@ -15,31 +15,31 @@ import (
protocol "github.com/libp2p/go-libp2p/core/protocol"
)
// MockP2pnetHost is a mock of P2pnetHost interface.
type MockP2pnetHost struct {
// MockP2pHost is a mock of P2pHost interface.
type MockP2pHost struct {
ctrl *gomock.Controller
recorder *MockP2pnetHostMockRecorder
recorder *MockP2pHostMockRecorder
}
// MockP2pnetHostMockRecorder is the mock recorder for MockP2pnetHost.
type MockP2pnetHostMockRecorder struct {
mock *MockP2pnetHost
// MockP2pHostMockRecorder is the mock recorder for MockP2pHost.
type MockP2pHostMockRecorder struct {
mock *MockP2pHost
}
// NewMockP2pnetHost creates a new mock instance.
func NewMockP2pnetHost(ctrl *gomock.Controller) *MockP2pnetHost {
mock := &MockP2pnetHost{ctrl: ctrl}
mock.recorder = &MockP2pnetHostMockRecorder{mock}
// NewMockP2pHost creates a new mock instance.
func NewMockP2pHost(ctrl *gomock.Controller) *MockP2pHost {
mock := &MockP2pHost{ctrl: ctrl}
mock.recorder = &MockP2pHostMockRecorder{mock}
return mock
}
// EXPECT returns an object that allows the caller to indicate expected use.
func (m *MockP2pnetHost) EXPECT() *MockP2pnetHostMockRecorder {
func (m *MockP2pHost) EXPECT() *MockP2pHostMockRecorder {
return m.recorder
}
// AddrInfo mocks base method.
func (m *MockP2pnetHost) AddrInfo() peer.AddrInfo {
func (m *MockP2pHost) AddrInfo() peer.AddrInfo {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "AddrInfo")
ret0, _ := ret[0].(peer.AddrInfo)
@@ -47,13 +47,13 @@ func (m *MockP2pnetHost) AddrInfo() peer.AddrInfo {
}
// AddrInfo indicates an expected call of AddrInfo.
func (mr *MockP2pnetHostMockRecorder) AddrInfo() *gomock.Call {
func (mr *MockP2pHostMockRecorder) AddrInfo() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrInfo", reflect.TypeOf((*MockP2pnetHost)(nil).AddrInfo))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddrInfo", reflect.TypeOf((*MockP2pHost)(nil).AddrInfo))
}
// Addresses mocks base method.
func (m *MockP2pnetHost) Addresses() []string {
func (m *MockP2pHost) Addresses() []string {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Addresses")
ret0, _ := ret[0].([]string)
@@ -61,25 +61,25 @@ func (m *MockP2pnetHost) Addresses() []string {
}
// Addresses indicates an expected call of Addresses.
func (mr *MockP2pnetHostMockRecorder) Addresses() *gomock.Call {
func (mr *MockP2pHostMockRecorder) Addresses() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Addresses", reflect.TypeOf((*MockP2pnetHost)(nil).Addresses))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Addresses", reflect.TypeOf((*MockP2pHost)(nil).Addresses))
}
// Advertise mocks base method.
func (m *MockP2pnetHost) Advertise(arg0 []string) {
func (m *MockP2pHost) Advertise(arg0 []string) {
m.ctrl.T.Helper()
m.ctrl.Call(m, "Advertise", arg0)
}
// Advertise indicates an expected call of Advertise.
func (mr *MockP2pnetHostMockRecorder) Advertise(arg0 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) Advertise(arg0 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Advertise", reflect.TypeOf((*MockP2pnetHost)(nil).Advertise), arg0)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Advertise", reflect.TypeOf((*MockP2pHost)(nil).Advertise), arg0)
}
// Connect mocks base method.
func (m *MockP2pnetHost) Connect(arg0 context.Context, arg1 peer.AddrInfo) error {
func (m *MockP2pHost) Connect(arg0 context.Context, arg1 peer.AddrInfo) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Connect", arg0, arg1)
ret0, _ := ret[0].(error)
@@ -87,13 +87,13 @@ func (m *MockP2pnetHost) Connect(arg0 context.Context, arg1 peer.AddrInfo) error
}
// Connect indicates an expected call of Connect.
func (mr *MockP2pnetHostMockRecorder) Connect(arg0, arg1 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) Connect(arg0, arg1 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connect", reflect.TypeOf((*MockP2pnetHost)(nil).Connect), arg0, arg1)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connect", reflect.TypeOf((*MockP2pHost)(nil).Connect), arg0, arg1)
}
// ConnectedPeers mocks base method.
func (m *MockP2pnetHost) ConnectedPeers() []string {
func (m *MockP2pHost) ConnectedPeers() []string {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "ConnectedPeers")
ret0, _ := ret[0].([]string)
@@ -101,13 +101,13 @@ func (m *MockP2pnetHost) ConnectedPeers() []string {
}
// ConnectedPeers indicates an expected call of ConnectedPeers.
func (mr *MockP2pnetHostMockRecorder) ConnectedPeers() *gomock.Call {
func (mr *MockP2pHostMockRecorder) ConnectedPeers() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectedPeers", reflect.TypeOf((*MockP2pnetHost)(nil).ConnectedPeers))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ConnectedPeers", reflect.TypeOf((*MockP2pHost)(nil).ConnectedPeers))
}
// Connectedness mocks base method.
func (m *MockP2pnetHost) Connectedness(arg0 peer.ID) network.Connectedness {
func (m *MockP2pHost) Connectedness(arg0 peer.ID) network.Connectedness {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Connectedness", arg0)
ret0, _ := ret[0].(network.Connectedness)
@@ -115,13 +115,13 @@ func (m *MockP2pnetHost) Connectedness(arg0 peer.ID) network.Connectedness {
}
// Connectedness indicates an expected call of Connectedness.
func (mr *MockP2pnetHostMockRecorder) Connectedness(arg0 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) Connectedness(arg0 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connectedness", reflect.TypeOf((*MockP2pnetHost)(nil).Connectedness), arg0)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Connectedness", reflect.TypeOf((*MockP2pHost)(nil).Connectedness), arg0)
}
// Discover mocks base method.
func (m *MockP2pnetHost) Discover(arg0 string, arg1 time.Duration) ([]peer.ID, error) {
func (m *MockP2pHost) Discover(arg0 string, arg1 time.Duration) ([]peer.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Discover", arg0, arg1)
ret0, _ := ret[0].([]peer.ID)
@@ -130,13 +130,13 @@ func (m *MockP2pnetHost) Discover(arg0 string, arg1 time.Duration) ([]peer.ID, e
}
// Discover indicates an expected call of Discover.
func (mr *MockP2pnetHostMockRecorder) Discover(arg0, arg1 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) Discover(arg0, arg1 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Discover", reflect.TypeOf((*MockP2pnetHost)(nil).Discover), arg0, arg1)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Discover", reflect.TypeOf((*MockP2pHost)(nil).Discover), arg0, arg1)
}
// NewStream mocks base method.
func (m *MockP2pnetHost) NewStream(arg0 context.Context, arg1 peer.ID, arg2 protocol.ID) (network.Stream, error) {
func (m *MockP2pHost) NewStream(arg0 context.Context, arg1 peer.ID, arg2 protocol.ID) (network.Stream, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "NewStream", arg0, arg1, arg2)
ret0, _ := ret[0].(network.Stream)
@@ -145,13 +145,13 @@ func (m *MockP2pnetHost) NewStream(arg0 context.Context, arg1 peer.ID, arg2 prot
}
// NewStream indicates an expected call of NewStream.
func (mr *MockP2pnetHostMockRecorder) NewStream(arg0, arg1, arg2 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) NewStream(arg0, arg1, arg2 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewStream", reflect.TypeOf((*MockP2pnetHost)(nil).NewStream), arg0, arg1, arg2)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewStream", reflect.TypeOf((*MockP2pHost)(nil).NewStream), arg0, arg1, arg2)
}
// PeerID mocks base method.
func (m *MockP2pnetHost) PeerID() peer.ID {
func (m *MockP2pHost) PeerID() peer.ID {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "PeerID")
ret0, _ := ret[0].(peer.ID)
@@ -159,37 +159,37 @@ func (m *MockP2pnetHost) PeerID() peer.ID {
}
// PeerID indicates an expected call of PeerID.
func (mr *MockP2pnetHostMockRecorder) PeerID() *gomock.Call {
func (mr *MockP2pHostMockRecorder) PeerID() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerID", reflect.TypeOf((*MockP2pnetHost)(nil).PeerID))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PeerID", reflect.TypeOf((*MockP2pHost)(nil).PeerID))
}
// SetShouldAdvertiseFunc mocks base method.
func (m *MockP2pnetHost) SetShouldAdvertiseFunc(arg0 func() bool) {
func (m *MockP2pHost) SetShouldAdvertiseFunc(arg0 func() bool) {
m.ctrl.T.Helper()
m.ctrl.Call(m, "SetShouldAdvertiseFunc", arg0)
}
// SetShouldAdvertiseFunc indicates an expected call of SetShouldAdvertiseFunc.
func (mr *MockP2pnetHostMockRecorder) SetShouldAdvertiseFunc(arg0 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) SetShouldAdvertiseFunc(arg0 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetShouldAdvertiseFunc", reflect.TypeOf((*MockP2pnetHost)(nil).SetShouldAdvertiseFunc), arg0)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetShouldAdvertiseFunc", reflect.TypeOf((*MockP2pHost)(nil).SetShouldAdvertiseFunc), arg0)
}
// SetStreamHandler mocks base method.
func (m *MockP2pnetHost) SetStreamHandler(arg0 string, arg1 func(network.Stream)) {
func (m *MockP2pHost) SetStreamHandler(arg0 string, arg1 func(network.Stream)) {
m.ctrl.T.Helper()
m.ctrl.Call(m, "SetStreamHandler", arg0, arg1)
}
// SetStreamHandler indicates an expected call of SetStreamHandler.
func (mr *MockP2pnetHostMockRecorder) SetStreamHandler(arg0, arg1 interface{}) *gomock.Call {
func (mr *MockP2pHostMockRecorder) SetStreamHandler(arg0, arg1 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStreamHandler", reflect.TypeOf((*MockP2pnetHost)(nil).SetStreamHandler), arg0, arg1)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetStreamHandler", reflect.TypeOf((*MockP2pHost)(nil).SetStreamHandler), arg0, arg1)
}
// Start mocks base method.
func (m *MockP2pnetHost) Start() error {
func (m *MockP2pHost) Start() error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Start")
ret0, _ := ret[0].(error)
@@ -197,13 +197,13 @@ func (m *MockP2pnetHost) Start() error {
}
// Start indicates an expected call of Start.
func (mr *MockP2pnetHostMockRecorder) Start() *gomock.Call {
func (mr *MockP2pHostMockRecorder) Start() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockP2pnetHost)(nil).Start))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Start", reflect.TypeOf((*MockP2pHost)(nil).Start))
}
// Stop mocks base method.
func (m *MockP2pnetHost) Stop() error {
func (m *MockP2pHost) Stop() error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Stop")
ret0, _ := ret[0].(error)
@@ -211,7 +211,7 @@ func (m *MockP2pnetHost) Stop() error {
}
// Stop indicates an expected call of Stop.
func (mr *MockP2pnetHostMockRecorder) Stop() *gomock.Call {
func (mr *MockP2pHostMockRecorder) Stop() *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockP2pnetHost)(nil).Stop))
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stop", reflect.TypeOf((*MockP2pHost)(nil).Stop))
}

View File

@@ -1,4 +1,3 @@
package xmrmaker
//nolint:lll
//go:generate mockgen -destination=mock_net_test.go -package $GOPACKAGE github.com/athanorlabs/atomic-swap/net P2pnetHost
//go:generate mockgen -destination=mock_net_test.go -package $GOPACKAGE github.com/athanorlabs/atomic-swap/net P2pHost

View File

@@ -19,7 +19,7 @@ func TestXMRMaker_HandleInitiateMessage(t *testing.T) {
db.EXPECT().PutOffer(offer)
db.EXPECT().DeleteOffer(offer.ID)
b.net.(*MockP2pnetHost).EXPECT().Advertise([]string{"XMR"})
b.net.(*MockP2pHost).EXPECT().Advertise([]string{"XMR"})
_, err := b.MakeOffer(offer, "", nil)
require.NoError(t, err)

View File

@@ -389,7 +389,7 @@ func TestSwapState_Exit_Success(t *testing.T) {
func TestSwapState_Exit_Refunded(t *testing.T) {
b, s, db := newTestSwapStateAndDB(t)
b.net.(*MockP2pnetHost).EXPECT().Advertise([]string{"XMR"})
b.net.(*MockP2pHost).EXPECT().Advertise([]string{"XMR"})
min := coins.StrToDecimal("0.1")
max := coins.StrToDecimal("0.2")