diff --git a/pkg/anonymity/qb/anonymity_test.go b/pkg/anonymity/qb/anonymity_test.go index a1490be1..723a4db4 100644 --- a/pkg/anonymity/qb/anonymity_test.go +++ b/pkg/anonymity/qb/anonymity_test.go @@ -649,7 +649,6 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string, privKey := asymmetric.NewPrivKey() msgChan := make(chan layer1.IMessage) parallel := uint64(1) - networkMask := uint32(1) limitVoidSize := uint64(10_000) networkNode := network.NewNode( network.NewSettings(&network.SSettings{ @@ -708,7 +707,6 @@ func testRunNodeWithDB(ctx context.Context, timeWait time.Duration, addr string, }), FParallel: parallel, }), - FNetworkMask: networkMask, FQueuePoolCap: [2]uint64{tcQueueCap, tcQueueCap}, FQueuePeriod: time.Second, FConsumersCap: 1, diff --git a/pkg/anonymity/qb/examples/echo/construct_a.go b/pkg/anonymity/qb/examples/echo/construct_a.go index e3f84931..8f862fd7 100644 --- a/pkg/anonymity/qb/examples/echo/construct_a.go +++ b/pkg/anonymity/qb/examples/echo/construct_a.go @@ -24,9 +24,8 @@ import ( ) const ( - networkMask = uint32(0x11223344) - msgSize = uint64(8192) - workSize = uint64(10) + msgSize = uint64(8192) + workSize = uint64(10) ) type sNode struct { @@ -120,7 +119,6 @@ func newNode(serviceName, address string) *sNode { FWorkSizeBits: workSize, }), }), - FNetworkMask: networkMask, FQueuePeriod: 2 * time.Second, FConsumersCap: 1, FQueuePoolCap: [2]uint64{32, 32}, diff --git a/pkg/anonymity/qb/examples/ping-pong/construct_a.go b/pkg/anonymity/qb/examples/ping-pong/construct_a.go index e3f84931..8f862fd7 100644 --- a/pkg/anonymity/qb/examples/ping-pong/construct_a.go +++ b/pkg/anonymity/qb/examples/ping-pong/construct_a.go @@ -24,9 +24,8 @@ import ( ) const ( - networkMask = uint32(0x11223344) - msgSize = uint64(8192) - workSize = uint64(10) + msgSize = uint64(8192) + workSize = uint64(10) ) type sNode struct { @@ -120,7 +119,6 @@ func newNode(serviceName, address string) *sNode { FWorkSizeBits: workSize, }), }), - FNetworkMask: networkMask, FQueuePeriod: 2 * time.Second, FConsumersCap: 1, FQueuePoolCap: [2]uint64{32, 32}, diff --git a/pkg/anonymity/qb/queue/queue_test.go b/pkg/anonymity/qb/queue/queue_test.go index 93b4c91d..d81a0894 100644 --- a/pkg/anonymity/qb/queue/queue_test.go +++ b/pkg/anonymity/qb/queue/queue_test.go @@ -160,7 +160,6 @@ func TestQueue(t *testing.T) { FWorkSizeBits: 10, }), }), - FNetworkMask: 1, FQueuePoolCap: [2]uint64{tcQueueCap, tcQueueCap}, FQueuePeriod: 100 * time.Millisecond, FConsumersCap: 1, diff --git a/pkg/anonymity/qb/queue/settings.go b/pkg/anonymity/qb/queue/settings.go index 9d341427..f4433032 100644 --- a/pkg/anonymity/qb/queue/settings.go +++ b/pkg/anonymity/qb/queue/settings.go @@ -13,7 +13,6 @@ var ( type SSettings sSettings type sSettings struct { FMessageConstructSettings layer1.IConstructSettings - FNetworkMask uint32 FConsumersCap uint64 FQueuePoolCap [2]uint64 FQueuePeriod time.Duration @@ -22,7 +21,6 @@ type sSettings struct { func NewSettings(pSett *SSettings) ISettings { return (&sSettings{ FMessageConstructSettings: pSett.FMessageConstructSettings, - FNetworkMask: pSett.FNetworkMask, FConsumersCap: pSett.FConsumersCap, FQueuePoolCap: pSett.FQueuePoolCap, FQueuePeriod: pSett.FQueuePeriod, @@ -50,10 +48,6 @@ func (p *sSettings) GetMessageConstructSettings() layer1.IConstructSettings { return p.FMessageConstructSettings } -func (p *sSettings) GetNetworkMask() uint32 { - return p.FNetworkMask -} - func (p *sSettings) GetQueuePoolCap() [2]uint64 { return p.FQueuePoolCap } diff --git a/pkg/anonymity/qb/queue/types.go b/pkg/anonymity/qb/queue/types.go index 9f8ee67f..5e6d9300 100644 --- a/pkg/anonymity/qb/queue/types.go +++ b/pkg/anonymity/qb/queue/types.go @@ -21,7 +21,6 @@ type IQBProblemProcessor interface { type ISettings interface { GetMessageConstructSettings() layer1.IConstructSettings - GetNetworkMask() uint32 GetConsumersCap() uint64 GetQueuePeriod() time.Duration GetQueuePoolCap() [2]uint64 diff --git a/test/result/badge_codelines.svg b/test/result/badge_codelines.svg index f2c118c7..4484af0e 100644 --- a/test/result/badge_codelines.svg +++ b/test/result/badge_codelines.svg @@ -1 +1 @@ -code lines: 12945code lines12945 \ No newline at end of file +code lines: 12931code lines12931 \ No newline at end of file diff --git a/test/result/coverage.svg b/test/result/coverage.svg index ef7f134d..5060eeb6 100644 --- a/test/result/coverage.svg +++ b/test/result/coverage.svg @@ -7,7 +7,7 @@ > - + - + - + - + anonymity/qb @@ -52,7 +52,7 @@ - + - + encoding @@ -78,12 +78,12 @@ - + logger @@ -91,12 +91,12 @@ - + network @@ -104,12 +104,12 @@ - + payload @@ -117,12 +117,12 @@ - + state @@ -130,12 +130,12 @@ - + storage @@ -143,12 +143,12 @@ - + types/converter.go @@ -156,12 +156,12 @@ - + action.go @@ -169,18 +169,18 @@ - + - + anonymity.go @@ -188,18 +188,18 @@ - + - + head.go @@ -207,12 +207,12 @@ - + logger/log_builder.go @@ -220,12 +220,12 @@ - + queue @@ -233,12 +233,12 @@ - + settings.go @@ -246,7 +246,7 @@ - + - + hashing @@ -272,18 +272,18 @@ - + - + puzzle/puzzle.go @@ -291,12 +291,12 @@ - + random/random.go @@ -304,7 +304,7 @@ - + - + symmetric @@ -330,12 +330,12 @@ - + bytes.go @@ -343,30 +343,30 @@ - + - + - + - + serialize_yaml.go @@ -374,12 +374,12 @@ - + logger.go @@ -387,18 +387,18 @@ - + - + conn @@ -406,12 +406,12 @@ - + connkeeper @@ -419,12 +419,12 @@ - + network.go @@ -432,12 +432,12 @@ - + settings.go @@ -445,12 +445,12 @@ - + joiner @@ -458,12 +458,12 @@ - + payload32.go @@ -471,12 +471,12 @@ - + payload64.go @@ -484,12 +484,12 @@ - + state.go @@ -497,12 +497,12 @@ - + cache/lru.go @@ -510,12 +510,12 @@ - + database @@ -523,18 +523,18 @@ - + - + queue.go @@ -542,12 +542,12 @@ - + settings.go @@ -555,12 +555,12 @@ - + dsa.go @@ -568,12 +568,12 @@ - + kem.go @@ -581,7 +581,7 @@ - + - + hashing.go @@ -607,12 +607,12 @@ - + hmac.go @@ -620,12 +620,12 @@ - + layer1 @@ -633,7 +633,7 @@ - + - + cfb.go @@ -659,12 +659,12 @@ - + cipher.go @@ -672,12 +672,12 @@ - + gcm.go @@ -685,12 +685,12 @@ - + conn.go @@ -698,12 +698,12 @@ - + settings.go @@ -711,12 +711,12 @@ - + connkeeper.go @@ -724,18 +724,18 @@ - + - + joiner32.go @@ -743,12 +743,12 @@ - + database.go @@ -756,12 +756,12 @@ - + message.go @@ -769,12 +769,12 @@ - + settings.go @@ -782,7 +782,7 @@ - + - + kcontainer.go @@ -808,12 +808,12 @@ - + symmetric @@ -821,12 +821,12 @@ - + message.go @@ -834,12 +834,12 @@ - + scheme.go @@ -847,12 +847,12 @@ - + scheme.go