Fixes, updates and refactor.

Author: Strabox

Gopkg.lock

@@ -7,7 +7,7 @@ Backend = "chord-single-offer" # chord-random, chord-single-offer, chord-mult
  SpreadOffersInterval = "1m"
  RefreshingInterval = "5m"
  [Caravela.DiscoveryBackend.RandomChordBackend]
- RandBackendMaxRetries = 10
+ RandBackendMaxRetries = 1
 [Caravela.Resources]
  [[Caravela.Resources.CPUPowers]]
  Value = 0

configuration.toml

@@ -47,6 +47,16 @@ func (mock *RemoteClientMock) RefreshOffer(ctx context.Context, fromTrader, toSu
 return node.RefreshOffer(ctx, fromTrader, offer), nil
 }
 
+func (mock *RemoteClientMock) UpdateOffer(ctx context.Context, fromSupplier, toTrader *types.Node, offer *types.Offer) error {
+node, nodeIndex := mock.nodeService.NodeByIP(toTrader.IP)
+
+// Collect Metrics
+mock.collector.APIRequestReceived(nodeIndex)
+
+node.UpdateOffer(ctx, fromSupplier, toTrader, offer)
+return nil
+}
+
 func (mock *RemoteClientMock) RemoveOffer(ctx context.Context, fromSupp, toTrader *types.Node, offer *types.Offer) error {
 node, nodeIndex := mock.nodeService.NodeByIP(toTrader.IP)
 

mocks/caravela/api_remote_client_mock.go

@@ -1,6 +1,6 @@
 NumberOfNodes = 50000
 TickInterval = "20s"
-MaxTicks = 45
+MaxTicks = 63
 Multithread = true
 DiscoveryBackends = ["chord-single-offer", "chord-multiple-offer", "chord-random"]
 RequestFeeder = "random" # random
@@ -11,4 +11,4 @@ CaravelaLogLevel = "info"
 ResourceGenerator = "partition-fit" # static, real, partition-fit
  [ResourcesGenerator.StaticResources]
  CPUs = 2
- RAM = 1024
+ RAM = 2048

simulation.toml

@@ -130,27 +130,27 @@ var requestProfiles = []requestProfile{
 CPUs: 1,
 RAM: 256,
 },
-Percentage: 50,
+Percentage: 40,
 },
 {
 Resources: types.Resources{
 CPUs: 2,
 RAM: 800,
 },
-Percentage: 35,
+Percentage: 30,
 },
 {
 Resources: types.Resources{
 CPUs: 3,
 RAM: 1500,
 },
-Percentage: 10,
+Percentage: 20,
 },
 {
 Resources: types.Resources{
 CPUs: 3,
 RAM: 2500,
 },
-Percentage: 5,
+Percentage: 10,
 },
 }