Skip to content

Commit

Permalink
Merge pull request #430 from wavesplatform/release-0.7.3
Browse files Browse the repository at this point in the history
Release 0.7.3
  • Loading branch information
alexeykiselev authored Jul 31, 2017
2 parents 09c616c + e541f4b commit bc0e84d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys

name := "waves"
organization := "com.wavesplatform"
version := "0.7.3-SNAPSHOT"
version := "0.7.3"
scalaVersion in ThisBuild := "2.12.3"
crossPaths := false
publishArtifact in (Compile, packageDoc) := false
Expand Down
3 changes: 1 addition & 2 deletions src/it/scala/com/wavesplatform/it/Docker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.dataformat.javaprop.JavaPropsMapper
import com.google.common.collect.ImmutableMap
import com.spotify.docker.client.DefaultDockerClient
import com.spotify.docker.client.DockerClient.{ListContainersParam, RemoveContainerParam}
import com.spotify.docker.client.DockerClient.RemoveContainerParam
import com.spotify.docker.client.messages.{ContainerConfig, HostConfig, NetworkConfig, PortBinding}
import com.typesafe.config.{Config, ConfigFactory, ConfigRenderOptions}
import org.asynchttpclient.Dsl._
Expand All @@ -16,7 +16,6 @@ import scorex.utils.ScorexLogging
import scala.collection.JavaConverters._
import scala.concurrent.Await
import scala.concurrent.duration._
import scala.util.Random

case class NodeInfo(
hostRestApiPort: Int,
Expand Down
4 changes: 1 addition & 3 deletions src/it/scala/com/wavesplatform/it/TransferSending.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package com.wavesplatform.it
import com.wavesplatform.it.TransferSending.Req
import com.wavesplatform.it.api.NodeApi.Transaction

import scala.collection.mutable
import scala.collection.mutable.ArrayBuffer
import scala.concurrent.Future
import scala.util.Random
import scala.concurrent.ExecutionContext.Implicits.global
Expand All @@ -25,7 +23,7 @@ trait TransferSending {
}
val requests = sourceAndDest.foldLeft(List.empty[Req]) {
case (rs, (src, dest)) =>
val transferAmount = (1e-8 + Random.nextDouble() * 1e-8 * balances(src)).toLong
val transferAmount = (1e-8 + Random.nextDouble() * 1e-8 * balances(src)).toLong
rs :+ Req(src, dest, transferAmount, fee)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ import java.net.InetSocketAddress
import java.util.concurrent.ConcurrentHashMap

import com.wavesplatform.Version
import com.wavesplatform.network.{BasicMessagesRepo, Handshake, HandshakeHandler, PeerInfo, PeerKey}
import com.wavesplatform.network.{Handshake, HandshakeHandler, PeerInfo, PeerKey}
import com.wavesplatform.settings._
import io.netty.bootstrap.Bootstrap
import io.netty.channel._
import io.netty.channel.group.ChannelGroup
import io.netty.channel.nio.NioEventLoopGroup
import io.netty.channel.socket.nio.NioSocketChannel
import scorex.network.message.MessageSpec
import scorex.utils.ScorexLogging

class NetworkClient(
Expand All @@ -28,8 +27,6 @@ class NetworkClient(
Handshake(Constants.ApplicationName + chainId, Version.VersionTuple, nodeName,
nonce, None)

private val specs: Map[Byte, MessageSpec[_ <: AnyRef]] = BasicMessagesRepo.specs.map(s => s.messageCode -> s).toMap

private val peerUniqueness = new ConcurrentHashMap[PeerKey, Channel]()

private val channels = new ConcurrentHashMap[InetSocketAddress, Channel]
Expand Down

0 comments on commit bc0e84d

Please sign in to comment.