Merge pull request #220 from filecoin-project/dev

Refactor snapshot codes

Author: joekingss

snapshot/Dockerfile.test

@@ -11,10 +11,10 @@ ENV GO111MODULE=on \
 WORKDIR /build
 
 
-COPY power-snapshot/go.mod power-snapshot/go.sum ./
+COPY snapshot/go.mod snapshot/go.sum ./
 RUN go mod tidy
 
-COPY power-snapshot/. .
+COPY snapshot/. .
 
 RUN go build -o app .
 

snapshot/api/backend.go

@@ -64,7 +64,7 @@ func GetAllVoterAddresss(chainId int64) ([]string, error) {
 		return nil, err
 	}
 
-	return grpcResp.Address, nil
+	return grpcResp.GetAddresses(), nil
 }
 
 func GetVoterInfo(address string) (models.VoterInfo, error) {
@@ -80,9 +80,13 @@ func GetVoterInfo(address string) (models.VoterInfo, error) {
 		return models.VoterInfo{}, err
 	}
 
+	var actorIds []string
+	if len(grpcResp.ActorId) > 1 {
+		actorIds = []string{grpcResp.ActorId}
+	}
 	return models.VoterInfo{
 		EthAddress:    common.HexToAddress(address),
-		ActorIds:      []uint64{grpcResp.ActorId},
+		ActorIds:      actorIds,
 		MinerIds:      grpcResp.MinerIds,
 		GithubAccount: grpcResp.GithubAccount,
 	}, nil

snapshot/api/proto/backend.pb.go

@@ -6,25 +6,25 @@ option go_package = "./proto;rpc";
 
 
 service Backend {
-    rpc GetAllVoterAddresss(GetAllVoterAddressRequest) returns (GetAllVoterAddressResponse);
-    rpc GetVoterInfo(GetVoterInfoRequest) returns (GetVoterInfoResponse);
+  rpc GetAllVoterAddresss(GetAllVoterAddressRequest) 
+    returns (GetAllVoterAddressResponse);
+  rpc GetVoterInfo(GetVoterInfoRequest) returns (GetVoterInfoResponse);
 }
 
 message GetAllVoterAddressRequest {
-    int64 chainId = 1;
+  int64 chain_id=1;
 }
 
 message GetVoterInfoRequest {
-    string address = 1;
+  string address = 1;
 }
 
 message GetAllVoterAddressResponse {
-    repeated string address = 1;
-    int64 endHeight = 2;
+  repeated string addresses = 1;
 }
 
 message GetVoterInfoResponse {
-    repeated uint64 minerIds = 1;
-    uint64 actorId =2;
-    string githubAccount = 3;
+  repeated string miner_ids = 1;
+  string actor_id =2;
+  string github_account = 3;
 }