Skip to content

Commit

Permalink
Organize io.grpc imports correctly
Browse files Browse the repository at this point in the history
And remove entry for the no longer used io.bisq.generated package.
  • Loading branch information
cbeams committed Jan 20, 2020
1 parent 9fceba6 commit 1e8633b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 4 additions & 6 deletions cli/src/main/java/bisq/cli/app/BisqCliMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@
import bisq.core.proto.network.CoreNetworkProtoResolver;
import bisq.core.proto.persistable.CorePersistenceProtoResolver;

import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.grpc.StatusRuntimeException;

import org.bitcoinj.core.Coin;

import java.time.Clock;
Expand All @@ -51,12 +55,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static java.lang.String.format;



import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
import io.grpc.StatusRuntimeException;

/**
* gRPC client.
*
Expand Down
10 changes: 4 additions & 6 deletions core/src/main/java/bisq/core/grpc/BisqGrpcServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
import bisq.core.trade.handlers.TransactionResultHandler;
import bisq.core.trade.statistics.TradeStatistics2;

import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver;

import java.io.IOException;

import java.util.List;
Expand All @@ -30,12 +34,6 @@
import lombok.extern.slf4j.Slf4j;



import io.grpc.Server;
import io.grpc.ServerBuilder;
import io.grpc.stub.StreamObserver;


/**
* gRPC server. Gets a instance of BisqFacade passed to access data from the running Bisq instance.
*/
Expand Down

0 comments on commit 1e8633b

Please sign in to comment.